diff --git a/htdocs/cron/list.php b/htdocs/cron/list.php index 9cdc59968a7..6323987705e 100644 --- a/htdocs/cron/list.php +++ b/htdocs/cron/list.php @@ -48,8 +48,8 @@ if (empty($page) || $page == -1) { $page = 0; } // If $page is not defined, $offset = $limit * $page; $pageprev = $page - 1; $pagenext = $page + 1; -if (! $sortfield) $sortfield='t.status'; -if (! $sortorder) $sortorder='ASC'; +if (! $sortfield) $sortfield='t.status,t.priority'; +if (! $sortorder) $sortorder='DESC,ASC'; $status=GETPOST('status','int'); if ($status == '') $status=-2; @@ -245,7 +245,8 @@ if ($action == 'delete') } if ($action == 'execute') { - print $form->formconfirm($_SERVER['PHP_SELF']."?id=".$id.'&status='.$status.'&securitykey='.$securitykey, $langs->trans("CronExecute"),$langs->trans("CronConfirmExecute"),"confirm_execute",'','',1); + var_dump($param); + print $form->formconfirm($_SERVER['PHP_SELF']."?id=".$id.'&status='.$status.'&securitykey='.$securitykey.'&restore_lastsearch_values=1', $langs->trans("CronExecute"),$langs->trans("CronConfirmExecute"),"confirm_execute",'','',1); } @@ -324,7 +325,7 @@ print_liste_field_titre("CronDtLastLaunch",$_SERVER["PHP_SELF"],"t.datelastrun", print_liste_field_titre("CronLastResult",$_SERVER["PHP_SELF"],"t.lastresult","",$param,'align="center"',$sortfield,$sortorder); print_liste_field_titre("CronLastOutput",$_SERVER["PHP_SELF"],"t.lastoutput","",$param,'',$sortfield,$sortorder); print_liste_field_titre("CronDtNextLaunch",$_SERVER["PHP_SELF"],"t.datenextrun","",$param,'align="center"',$sortfield,$sortorder); -print_liste_field_titre("Status",$_SERVER["PHP_SELF"],"t.status","",$param,'align="center"',$sortfield,$sortorder); +print_liste_field_titre("Status",$_SERVER["PHP_SELF"],"t.status,t.priority","",$param,'align="center"',$sortfield,$sortorder); print_liste_field_titre(''); print "\n"; @@ -347,6 +348,7 @@ if ($num > 0) $object->id = $obj->rowid; $object->ref = $obj->rowid; $object->label = $obj->label; + $object->status = $obj->status; $object->priority = $obj->priority; print '