diff --git a/htdocs/core/modules/modCron.class.php b/htdocs/core/modules/modCron.class.php
index 7f17b07503e..2080767e00c 100644
--- a/htdocs/core/modules/modCron.class.php
+++ b/htdocs/core/modules/modCron.class.php
@@ -25,6 +25,7 @@
*/
include_once DOL_DOCUMENT_ROOT .'/core/modules/DolibarrModules.class.php';
+
/**
* Class to describe a Cron module
*/
@@ -122,8 +123,8 @@ class modCron extends DolibarrModules
$r=0;
$this->menu[$r]=array( 'fk_menu'=>'fk_mainmenu=home,fk_leftmenu=modulesadmintools', // Use 'fk_mainmenu=xxx' or 'fk_mainmenu=xxx,fk_leftmenu=yyy' where xxx is mainmenucode and yyy is a leftmenucode
'type'=>'left', // This is a Left menu entry
- 'titre'=>'CronListActive',
- 'url'=>'/cron/list.php?status=1',
+ 'titre'=>'CronList',
+ 'url'=>'/cron/list.php?status=-1',
'langs'=>'cron', // Lang file to use (without .lang) by module. File must be in langs/code_CODE/ directory.
'position'=>200,
'enabled'=>'$leftmenu==\'modulesadmintools\'', // Define condition to show or hide menu entry. Use '$conf->mymodule->enabled' if entry must be visible if module is enabled. Use '$leftmenu==\'system\'' to show if leftmenu system is selected.
@@ -131,18 +132,6 @@ class modCron extends DolibarrModules
'target'=>'',
'user'=>2); // 0=Menu for internal users, 1=external users, 2=both
$r++;
-
- $this->menu[$r]=array( 'fk_menu'=>'fk_mainmenu=home,fk_leftmenu=modulesadmintools', // Use 'fk_mainmenu=xxx' or 'fk_mainmenu=xxx,fk_leftmenu=yyy' where xxx is mainmenucode and yyy is a leftmenucode
- 'type'=>'left', // This is a Left menu entry
- 'titre'=>'CronListInactive',
- 'url'=>'/cron/list.php?status=0',
- 'langs'=>'cron', // Lang file to use (without .lang) by module. File must be in langs/code_CODE/ directory.
- 'position'=>201,
- 'enabled'=>'$leftmenu==\'modulesadmintools\'', // Define condition to show or hide menu entry. Use '$conf->mymodule->enabled' if entry must be visible if module is enabled. Use '$leftmenu==\'system\'' to show if leftmenu system is selected.
- 'perms'=>'$user->rights->cron->read', // Use 'perms'=>'$user->rights->mymodule->level1->level2' if you want your menu with a permission rules
- 'target'=>'',
- 'user'=>2); // 0=Menu for internal users, 1=external users, 2=both
- $r++;
}
diff --git a/htdocs/cron/class/cronjob.class.php b/htdocs/cron/class/cronjob.class.php
index 60514e73942..454eb457517 100644
--- a/htdocs/cron/class/cronjob.class.php
+++ b/htdocs/cron/class/cronjob.class.php
@@ -393,10 +393,9 @@ class Cronjob extends CommonObject
$sql.= " t.note,";
$sql.= " t.nbrun";
-
$sql.= " FROM ".MAIN_DB_PREFIX."cronjob as t";
- $status = (empty($status))?'0':'1';
- $sql.= " WHERE t.status=".$status;
+ $sql.= " WHERE 1 = 1";
+ if ($status >= 0) $sql.= " AND t.status = ".(empty($status)?'0':'1');
//Manage filter
if (is_array($filter) && count($filter)>0) {
foreach($filter as $key => $value) {
@@ -404,7 +403,6 @@ class Cronjob extends CommonObject
}
}
-
$sql.= " ORDER BY $sortfield $sortorder ";
if (!empty($limit) && !empty($offset)) {
$sql.= $this->db->plimit($limit + 1,$offset);
@@ -836,7 +834,7 @@ class Cronjob extends CommonObject
$error=0;
$now=dol_now();
-
+
$langs->load('cron');
if (empty($userlogin)) {
diff --git a/htdocs/cron/list.php b/htdocs/cron/list.php
index a78b037d68b..42b41d0ed4f 100644
--- a/htdocs/cron/list.php
+++ b/htdocs/cron/list.php
@@ -108,8 +108,9 @@ if ($action == 'confirm_execute' && $confirm == "yes" && $user->rights->cron->ex
$form = new Form($db);
-if (!empty($status)) $pagetitle=$langs->trans("CronListActive");
-else $pagetitle=$langs->trans("CronListInactive");
+//if (! empty($status)) $pagetitle=$langs->trans("CronListActive");
+//else $pagetitle=$langs->trans("CronListInactive");
+$pagetitle=$langs->trans("CronList");
llxHeader('',$pagetitle);
@@ -155,8 +156,8 @@ if (count($object->lines)>0) {
print_liste_field_titre($langs->trans("CronNbRun"),$_SERVEUR['PHP_SELF'],"t.nbrun","",$arg_url,'',$sortfield,$sortorder);
print_liste_field_titre($langs->trans("CronLastResult"),$_SERVEUR['PHP_SELF'],"t.lastresult","",$arg_url,'',$sortfield,$sortorder);
print_liste_field_titre($langs->trans("CronLastOutput"),$_SERVEUR['PHP_SELF'],"t.lastoutput","",$arg_url,'',$sortfield,$sortorder);
+ print_liste_field_titre($langs->trans("Active"),$_SERVEUR['PHP_SELF'],"t.status","",$arg_url,'align="center"',$sortfield,$sortorder);
print ' | ';
-
print '';
print '