Skip to content
Snippets Groups Projects
Commit 9aa6c72a authored by Laurent Destailleur's avatar Laurent Destailleur
Browse files

FIX Update of maxnbrun on job list failed.

parent 9affdc08
No related branches found
No related tags found
No related merge requests found
...@@ -284,7 +284,7 @@ if ($action == 'delete') ...@@ -284,7 +284,7 @@ if ($action == 'delete')
} }
if ($action == 'execute'){ if ($action == 'execute'){
print $form->formconfirm($_SERVER['PHP_SELF']."?id=".$object->id,$langs->trans("CronExecute"),$langs->trans("CronConfirmExecute"),"confirm_execute",'','',1); print $form->formconfirm($_SERVER['PHP_SELF']."?id=".$object->id.(empty($conf->global->CRON_KEY)?'':'&securitykey='.$conf->global->CRON_KEY),$langs->trans("CronExecute"),$langs->trans("CronConfirmExecute"),"confirm_execute",'','',1);
$action=''; $action='';
} }
...@@ -316,7 +316,7 @@ if (($action=="create") || ($action=="edit")) ...@@ -316,7 +316,7 @@ if (($action=="create") || ($action=="edit"))
print '<table class="border" width="100%">'; print '<table class="border" width="100%">';
print '<tr><td width="30%">'; print '<tr><td class="fieldrequired titlefieldcreate">';
print $langs->trans('CronLabel')."</td>"; print $langs->trans('CronLabel')."</td>";
print "<td><input type=\"text\" size=\"20\" name=\"label\" value=\"".$object->label."\" /> "; print "<td><input type=\"text\" size=\"20\" name=\"label\" value=\"".$object->label."\" /> ";
print "</td>"; print "</td>";
...@@ -324,7 +324,7 @@ if (($action=="create") || ($action=="edit")) ...@@ -324,7 +324,7 @@ if (($action=="create") || ($action=="edit"))
print "</td>"; print "</td>";
print "</tr>\n"; print "</tr>\n";
print "<tr><td>"; print '<tr><td class="fieldrequired">';
print $langs->trans('CronType')."</td><td>"; print $langs->trans('CronType')."</td><td>";
print $formCron->select_typejob('jobtype',$object->jobtype); print $formCron->select_typejob('jobtype',$object->jobtype);
print "</td>"; print "</td>";
...@@ -395,7 +395,7 @@ if (($action=="create") || ($action=="edit")) ...@@ -395,7 +395,7 @@ if (($action=="create") || ($action=="edit"))
print "</td>"; print "</td>";
print "</tr>\n"; print "</tr>\n";
print "<tr><td>"; print '<tr><td class="fieldrequired">';
print $langs->trans('CronEvery')."</td>"; print $langs->trans('CronEvery')."</td>";
print "<td>"; print "<td>";
print "<select name=\"nbfrequency\">"; print "<select name=\"nbfrequency\">";
...@@ -496,7 +496,7 @@ if (($action=="create") || ($action=="edit")) ...@@ -496,7 +496,7 @@ if (($action=="create") || ($action=="edit"))
print "</td>"; print "</td>";
print "</tr>\n"; print "</tr>\n";
print '<tr><td width="30%">'; print '<tr><td>';
$maxrun=''; $maxrun='';
if (!empty($object->maxrun)) { if (!empty($object->maxrun)) {
$maxrun=$object->maxrun; $maxrun=$object->maxrun;
...@@ -552,7 +552,7 @@ else ...@@ -552,7 +552,7 @@ else
// box add_jobs_box // box add_jobs_box
print '<table class="border" width="100%">'; print '<table class="border" width="100%">';
print '<tr><td width="30%">'; print '<tr><td class="titlefield">';
print $langs->trans('CronId')."</td>"; print $langs->trans('CronId')."</td>";
print "<td>".$form->showrefnav($object, 'id', $linkback, 1, 'rowid', 'id', '', '', 0); print "<td>".$form->showrefnav($object, 'id', $linkback, 1, 'rowid', 'id', '', '', 0);
print "</td></tr>\n"; print "</td></tr>\n";
...@@ -614,7 +614,7 @@ else ...@@ -614,7 +614,7 @@ else
print '<table class="border" width="100%">'; print '<table class="border" width="100%">';
print "<tr><td>"; print '<tr><td class="titlefield">';
print $langs->trans('CronEvery')."</td>"; print $langs->trans('CronEvery')."</td>";
print "<td>"; print "<td>";
if($object->unitfrequency == "60") print $langs->trans('CronEach')." ".($object->frequency)." ".$langs->trans('Minutes'); if($object->unitfrequency == "60") print $langs->trans('CronEach')." ".($object->frequency)." ".$langs->trans('Minutes');
...@@ -623,7 +623,7 @@ else ...@@ -623,7 +623,7 @@ else
if($object->unitfrequency == "604800") print $langs->trans('CronEach')." ".($object->frequency)." ".$langs->trans('Weeks'); if($object->unitfrequency == "604800") print $langs->trans('CronEach')." ".($object->frequency)." ".$langs->trans('Weeks');
print "</td></tr>"; print "</td></tr>";
print '<tr><td width="30%">'; print '<tr><td>';
print $langs->trans('CronDtStart')."</td><td>"; print $langs->trans('CronDtStart')."</td><td>";
if(!empty($object->datestart)) {print dol_print_date($object->datestart,'dayhoursec');} if(!empty($object->datestart)) {print dol_print_date($object->datestart,'dayhoursec');}
print "</td></tr>"; print "</td></tr>";
...@@ -640,7 +640,8 @@ else ...@@ -640,7 +640,8 @@ else
print "<tr><td>"; print "<tr><td>";
print $langs->trans('CronMaxRun')."</td>"; print $langs->trans('CronMaxRun')."</td>";
print "<td>".$object->maxrun; print "<td>";
print $object->maxrun>0?$object->maxrun:'';
print "</td></tr>"; print "</td></tr>";
print "<tr><td>"; print "<tr><td>";
...@@ -666,7 +667,7 @@ else ...@@ -666,7 +667,7 @@ else
print '<table class="border" width="100%">'; print '<table class="border" width="100%">';
print '<tr><td width="30%">'; print '<tr><td class="titlefield">';
print $langs->trans('CronDtLastLaunch')."</td><td>"; print $langs->trans('CronDtLastLaunch')."</td><td>";
if(!empty($object->datelastrun)) {print dol_print_date($object->datelastrun,'dayhoursec');} else {print $langs->trans('CronNone');} if(!empty($object->datelastrun)) {print dol_print_date($object->datelastrun,'dayhoursec');} else {print $langs->trans('CronNone');}
print "</td></tr>"; print "</td></tr>";
...@@ -707,7 +708,7 @@ else ...@@ -707,7 +708,7 @@ else
print '<a class="butActionRefused" href="#" title="'.dol_escape_htmltag($langs->transnoentitiesnoconv("JobDisabled")).'">'.$langs->trans("CronExecute").'</a>'; print '<a class="butActionRefused" href="#" title="'.dol_escape_htmltag($langs->transnoentitiesnoconv("JobDisabled")).'">'.$langs->trans("CronExecute").'</a>';
} }
else { else {
print '<a class="butAction" href="'.$_SERVER['PHP_SELF'].'?action=execute&id='.$object->id.'">'.$langs->trans("CronExecute").'</a>'; print '<a class="butAction" href="'.$_SERVER['PHP_SELF'].'?action=execute&id='.$object->id.(empty($conf->global->CRON_KEY)?'':'&securitykey='.$conf->global->CRON_KEY).'">'.$langs->trans("CronExecute").'</a>';
} }
if (! $user->rights->cron->create) { if (! $user->rights->cron->create) {
......
...@@ -191,7 +191,7 @@ class Cronjob extends CommonObject ...@@ -191,7 +191,7 @@ class Cronjob extends CommonObject
$sql.= " ".(! isset($this->params)?'NULL':"'".$this->db->escape($this->params)."'").","; $sql.= " ".(! isset($this->params)?'NULL':"'".$this->db->escape($this->params)."'").",";
$sql.= " ".(! isset($this->md5params)?'NULL':"'".$this->db->escape($this->md5params)."'").","; $sql.= " ".(! isset($this->md5params)?'NULL':"'".$this->db->escape($this->md5params)."'").",";
$sql.= " ".(! isset($this->module_name)?'NULL':"'".$this->db->escape($this->module_name)."'").","; $sql.= " ".(! isset($this->module_name)?'NULL':"'".$this->db->escape($this->module_name)."'").",";
$sql.= " ".(! isset($this->priority)?'NULL':"'".$this->priority."'").","; $sql.= " ".(! isset($this->priority)?'0':$this->priority).",";
$sql.= " ".(! isset($this->datelastrun) || dol_strlen($this->datelastrun)==0?'NULL':$this->db->idate($this->datelastrun)).","; $sql.= " ".(! isset($this->datelastrun) || dol_strlen($this->datelastrun)==0?'NULL':$this->db->idate($this->datelastrun)).",";
$sql.= " ".(! isset($this->datenextrun) || dol_strlen($this->datenextrun)==0?'NULL':$this->db->idate($this->datenextrun)).","; $sql.= " ".(! isset($this->datenextrun) || dol_strlen($this->datenextrun)==0?'NULL':$this->db->idate($this->datenextrun)).",";
$sql.= " ".(! isset($this->dateend) || dol_strlen($this->dateend)==0?'NULL':$this->db->idate($this->dateend)).","; $sql.= " ".(! isset($this->dateend) || dol_strlen($this->dateend)==0?'NULL':$this->db->idate($this->dateend)).",";
...@@ -200,13 +200,13 @@ class Cronjob extends CommonObject ...@@ -200,13 +200,13 @@ class Cronjob extends CommonObject
$sql.= " ".(! isset($this->datelastresult) || dol_strlen($this->datelastresult)==0?'NULL':$this->db->idate($this->datelastresult)).","; $sql.= " ".(! isset($this->datelastresult) || dol_strlen($this->datelastresult)==0?'NULL':$this->db->idate($this->datelastresult)).",";
$sql.= " ".(! isset($this->lastoutput)?'NULL':"'".$this->db->escape($this->lastoutput)."'").","; $sql.= " ".(! isset($this->lastoutput)?'NULL':"'".$this->db->escape($this->lastoutput)."'").",";
$sql.= " ".(! isset($this->unitfrequency)?'NULL':"'".$this->unitfrequency."'").","; $sql.= " ".(! isset($this->unitfrequency)?'NULL':"'".$this->unitfrequency."'").",";
$sql.= " ".(! isset($this->frequency)?'NULL':"'".$this->frequency."'").","; $sql.= " ".(! isset($this->frequency)?'0':$this->frequency).",";
$sql.= " ".(! isset($this->status)?'0':"'".$this->status."'").","; $sql.= " ".(! isset($this->status)?'0':$this->status).",";
$sql.= " ".$user->id.","; $sql.= " ".$user->id.",";
$sql.= " ".$user->id.","; $sql.= " ".$user->id.",";
$sql.= " ".(! isset($this->note)?'NULL':"'".$this->db->escape($this->note)."'").","; $sql.= " ".(! isset($this->note)?'NULL':"'".$this->db->escape($this->note)."'").",";
$sql.= " ".(! isset($this->nbrun)?'0':"'".$this->db->escape($this->nbrun)."'").","; $sql.= " ".(! isset($this->nbrun)?'0':$this->db->escape($this->nbrun)).",";
$sql.= " ".(empty($this->maxrun)?'null':"'".$this->db->escape($this->maxrun)."'").","; $sql.= " ".(empty($this->maxrun)?'0':$this->db->escape($this->maxrun)).",";
$sql.= " ".(! isset($this->libname)?'NULL':"'".$this->db->escape($this->libname)."'").","; $sql.= " ".(! isset($this->libname)?'NULL':"'".$this->db->escape($this->libname)."'").",";
$sql.= " ".(! isset($this->test)?'NULL':"'".$this->db->escape($this->test)."'").""; $sql.= " ".(! isset($this->test)?'NULL':"'".$this->db->escape($this->test)."'")."";
$sql.= ")"; $sql.= ")";
...@@ -518,7 +518,7 @@ class Cronjob extends CommonObject ...@@ -518,7 +518,7 @@ class Cronjob extends CommonObject
if (isset($this->status)) $this->status=trim($this->status); if (isset($this->status)) $this->status=trim($this->status);
if (isset($this->note)) $this->note=trim($this->note); if (isset($this->note)) $this->note=trim($this->note);
if (isset($this->nbrun)) $this->nbrun=trim($this->nbrun); if (isset($this->nbrun)) $this->nbrun=trim($this->nbrun);
if (isset($this->maxrun)) $this->maxrun=trim($this->maxrun); if (empty($this->maxrun)) $this->maxrun=0;
if (isset($this->libname)) $this->libname = trim($this->libname); if (isset($this->libname)) $this->libname = trim($this->libname);
if (isset($this->test)) $this->test = trim($this->test); if (isset($this->test)) $this->test = trim($this->test);
...@@ -589,7 +589,7 @@ class Cronjob extends CommonObject ...@@ -589,7 +589,7 @@ class Cronjob extends CommonObject
$sql.= " fk_user_mod=".$user->id.","; $sql.= " fk_user_mod=".$user->id.",";
$sql.= " note=".(isset($this->note)?"'".$this->db->escape($this->note)."'":"null").","; $sql.= " note=".(isset($this->note)?"'".$this->db->escape($this->note)."'":"null").",";
$sql.= " nbrun=".((isset($this->nbrun) && $this->nbrun >0)?$this->nbrun:"null").","; $sql.= " nbrun=".((isset($this->nbrun) && $this->nbrun >0)?$this->nbrun:"null").",";
$sql.= " maxrun=".((isset($this->maxrun) && $this->maxrun > 0)?$this->maxrun:"null").","; $sql.= " maxrun=".((isset($this->maxrun) && $this->maxrun > 0)?$this->maxrun:"0").",";
$sql.= " libname=".(isset($this->libname)?"'".$this->db->escape($this->libname)."'":"null").","; $sql.= " libname=".(isset($this->libname)?"'".$this->db->escape($this->libname)."'":"null").",";
$sql.= " test=".(isset($this->test)?"'".$this->db->escape($this->test)."'":"null"); $sql.= " test=".(isset($this->test)?"'".$this->db->escape($this->test)."'":"null");
$sql.= " WHERE rowid=".$this->id; $sql.= " WHERE rowid=".$this->id;
......
...@@ -350,7 +350,7 @@ if ($num > 0) ...@@ -350,7 +350,7 @@ if ($num > 0)
} }
if ($user->rights->cron->execute) if ($user->rights->cron->execute)
{ {
if (!empty($line->status)) print "<a href=\"".$_SERVER["PHP_SELF"]."?id=".$line->id."&action=execute".($sortfield?'&sortfield='.$sortfield:'').($sortorder?'&sortorder='.$sortorder:'').$param."\" title=\"".dol_escape_htmltag($langs->trans('CronExecute'))."\">".img_picto($langs->trans('CronExecute'),"play")."</a>"; if (!empty($line->status)) print "<a href=\"".$_SERVER["PHP_SELF"]."?id=".$line->id."&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")."</a>";
else print "<a href=\"#\" title=\"".dol_escape_htmltag($langs->trans('JobDisabled'))."\">".img_picto($langs->trans('JobDisabled'),"play")."</a>"; else print "<a href=\"#\" title=\"".dol_escape_htmltag($langs->trans('JobDisabled'))."\">".img_picto($langs->trans('JobDisabled'),"play")."</a>";
} else { } else {
print "<a href=\"#\" title=\"".dol_escape_htmltag($langs->trans('NotEnoughPermissions'))."\">".img_picto($langs->trans('NotEnoughPermissions'),"play")."</a>"; print "<a href=\"#\" title=\"".dol_escape_htmltag($langs->trans('NotEnoughPermissions'))."\">".img_picto($langs->trans('NotEnoughPermissions'),"play")."</a>";
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment