diff --git a/htdocs/cron/list.php b/htdocs/cron/list.php
index ba28d019958..9cdc59968a7 100644
--- a/htdocs/cron/list.php
+++ b/htdocs/cron/list.php
@@ -138,7 +138,7 @@ if ($action == 'confirm_execute' && $confirm == "yes" && $user->rights->cron->ex
$action='';
}
- header("Location: ".DOL_URL_ROOT.'/cron/list.php?status=-2'); // Make a redirect to avoid to run twice the job when using back
+ header("Location: ".DOL_URL_ROOT.'/cron/list.php?status=-2&restore_lastsearch_values=1'); // Make a redirect to avoid to run twice the job when using back
exit;
}
}
@@ -301,6 +301,7 @@ print '
| ';
print ' | ';
print ' | ';
print ' | ';
+print ' | ';
print '';
print $form->selectarray('status', array('0'=>$langs->trans("Disabled"), '1'=>$langs->trans("Enabled"), '-2'=>$langs->trans("EnabledAndDisabled"), '2'=>$langs->trans("Archived")), $status, 1);
print ' | ';
@@ -312,6 +313,7 @@ print '';
print ' | ';
print_liste_field_titre("ID",$_SERVER["PHP_SELF"],"t.rowid","",$param,'',$sortfield,$sortorder);
print_liste_field_titre("CronLabel",$_SERVER["PHP_SELF"],"t.label","",$param,'',$sortfield,$sortorder);
+print_liste_field_titre("Prority",$_SERVER["PHP_SELF"],"t.priority","",$param,'',$sortfield,$sortorder);
print_liste_field_titre("CronTask",'','',"",$param,'',$sortfield,$sortorder);
print_liste_field_titre("CronFrequency",'',"","",$param,'',$sortfield,$sortorder);
print_liste_field_titre("CronDtStart",$_SERVER["PHP_SELF"],"t.datestart","",$param,'align="center"',$sortfield,$sortorder);
@@ -345,13 +347,16 @@ if ($num > 0)
$object->id = $obj->rowid;
$object->ref = $obj->rowid;
$object->label = $obj->label;
+ $object->priority = $obj->priority;
print '
';
+ // Ref
print '| ';
print $object->getNomUrl(1);
print ' | ';
+ // Label
print '';
if (! empty($obj->label))
{
@@ -365,6 +370,11 @@ if ($num > 0)
}
print ' | ';
+ // Priority
+ print '';
+ print $object->priority;
+ print ' | ';
+
print '';
if ($obj->jobtype=='method')
{
@@ -445,7 +455,7 @@ if ($num > 0)
}
if ($user->rights->cron->execute)
{
- if (!empty($obj->status)) print "rowid."&action=execute".(empty($conf->global->CRON_KEY)?'':'&securitykey='.$conf->global->CRON_KEY).($sortfield?'&sortfield='.$sortfield:'').($sortorder?'&sortorder='.$sortorder:'').$param."\" title=\"".dol_escape_htmltag($langs->trans('CronExecute'))."\">".img_picto($langs->trans('CronExecute'),"play")."";
+ if (!empty($obj->status)) print "rowid."&action=execute&save_lastsearch_values=1".(empty($conf->global->CRON_KEY)?'':'&securitykey='.$conf->global->CRON_KEY).($sortfield?'&sortfield='.$sortfield:'').($sortorder?'&sortorder='.$sortorder:'').$param."\" title=\"".dol_escape_htmltag($langs->trans('CronExecute'))."\">".img_picto($langs->trans('CronExecute'),"play")."";
else print "trans('JobDisabled'))."\">".img_picto($langs->trans('JobDisabled'),"playdisabled")."";
} else {
print "trans('NotEnoughPermissions'))."\">".img_picto($langs->trans('NotEnoughPermissions'),"playdisabled")."";
|