lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #1940 from aternatik/fix-cron

Browse Source 
Missing reprogramming task into GUI for cron module.
This commit is contained in:
Laurent Destailleur 2014-10-12 02:10:09 +02:00
commit 797ab8a150
2 changed files with 27 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
htdocs/cron/card.php
View File

@ -94,11 +94,20 @@ if ($action == 'confirm_execute' && $confirm == "yes" && $user->rights->cron->ex
$action=''; $action='';
} }
else else
{
$res = $object->reprogram_jobs($user->login);
if ($res > 0)
{ {
if ($object->lastresult > 0) setEventMessage($langs->trans("JobFinished"),'warnings'); if ($object->lastresult > 0) setEventMessage($langs->trans("JobFinished"),'warnings');
else setEventMessage($langs->trans("JobFinished"),'mesgs'); else setEventMessage($langs->trans("JobFinished"),'mesgs');
$action=''; $action='';
} }
else
{
setEventMessage($object->error,'errors');
$action='';
}
}
} }

15
htdocs/cron/list.php
View File

@ -100,6 +100,21 @@ if ($action == 'confirm_execute' && $confirm == "yes" && $user->rights->cron->ex
if ($result < 0) { if ($result < 0) {
setEventMessage($object->error,'errors'); setEventMessage($object->error,'errors');
} }
else
{
$res = $object->reprogram_jobs($user->login);
if ($res > 0)
{
if ($object->lastresult > 0) setEventMessage($langs->trans("JobFinished"),'warnings');
else setEventMessage($langs->trans("JobFinished"),'mesgs');
$action='';
}
else
{
setEventMessage($object->error,'errors');
$action='';
}
}
header("Location: ".DOL_URL_ROOT.'/cron/list.php?status=-1'); // Make a call to avoid to run twice job when using back header("Location: ".DOL_URL_ROOT.'/cron/list.php?status=-1'); // Make a call to avoid to run twice job when using back
exit; exit;