Skip to content

Commit 1206c44

Browse files
authored
Merge pull request #6690 from BOINC/dpa_buda25
web (BUDA): input files are not sticky or executable
2 parents 2076ba3 + debc363 commit 1206c44

File tree

3 files changed

+12
-5
lines changed

3 files changed

+12
-5
lines changed

html/inc/bootstrap.inc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -195,7 +195,7 @@ function sample_navbar(
195195
$x[] = ["Submit jobs", $url_prefix."submit.php"];
196196
$x[] = ["Job status", $url_prefix."submit.php?action=show_user_batches"];
197197
if ($user_submit->manage_all) {
198-
$x[] = ["Manage apps", $url_prefix."submit.php?action=admin"];
198+
$x[] = ["Manage batches and apps", $url_prefix."submit.php?action=admin"];
199199
$x[] = ["Manage permissions", $url_prefix."manage_project.php"];
200200
} else {
201201
// if user has manage permissions for apps, show links

html/user/buda.php

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -184,6 +184,9 @@ function variant_form($user) {
184184
// can't change CPU type of existing variant
185185
form_input_hidden('variant', $variant);
186186
form_input_hidden('edit', 'true');
187+
$x = explode('_', $variant);
188+
$cpu_type = $x[0];
189+
form_input_hidden('cpu_type', $cpu_type);
187190
} else {
188191
form_radio_buttons(
189192
'CPU type', 'cpu_type',
@@ -225,7 +228,7 @@ function create_templates($app, $desc, $dir) {
225228
$x = "<input_template>\n";
226229
$ninfiles = count($desc->input_file_names);
227230
for ($i=0; $i<$ninfiles; $i++) {
228-
$x .= " <file_info>\n <sticky/>\n <no_delete/>\n <executable/>\n </file_info>\n";
231+
$x .= " <file_info>\n <no_delete/>\n </file_info>\n";
229232
}
230233
$x .= " <workunit>\n";
231234
foreach ($desc->input_file_names as $fname) {

html/user/submit.php

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -826,7 +826,6 @@ function handle_query_job($user) {
826826
$is_assim_move = is_assim_move($app);
827827

828828
page_head("Job '$wu->name'");
829-
text_start(800);
830829

831830
echo "
832831
<ul>
@@ -845,6 +844,9 @@ function handle_query_job($user) {
845844
table_header(
846845
"ID<br><small>click for details and stderr</small>",
847846
"State",
847+
'Sent',
848+
'Received',
849+
'Priority',
848850
"Output files"
849851
);
850852
$results = BoincResult::enum("workunitid=$wuid");
@@ -853,7 +855,10 @@ function handle_query_job($user) {
853855
foreach ($results as $result) {
854856
$x = [
855857
"<a href=result.php?resultid=$result->id>$result->id</a>",
856-
state_string($result)
858+
state_string($result),
859+
time_str($result->sent_time),
860+
time_str($result->received_time),
861+
$result->priority
857862
];
858863
if ($is_assim_move) {
859864
if ($result->id == $wu->canonical_resultid) {
@@ -937,7 +942,6 @@ function handle_query_job($user) {
937942
echo "The job has no input files.<p>";
938943
}
939944

940-
text_end();
941945
return_link();
942946
page_tail();
943947
}

0 commit comments

Comments
 (0)