Merge branch 'master' of github.com:easysoft/zentaopms

This commit is contained in:
wangyidong
2016-11-17 13:34:55 +08:00
2 changed files with 2 additions and 1 deletions
+1 -1
View File
@@ -54,7 +54,7 @@
<td class='text-left' title='<?php echo $cron->remark?>'><?php echo $cron->remark;?></td>
<td><?php echo substr($cron->lastTime, 2);?></td>
<td><?php echo zget($lang->cron->statusList, $cron->status, '');?></td>
<td class='text-left'>
<td class='text-center'>
<?php
if(common::hasPriv('cron', 'toggle') and !empty($cron->command)) echo html::a(inlink('toggle', "id=$cron->id&status=" . ($cron->status == 'stop' ? 'normal' : 'stop')), $cron->status == 'stop' ? $lang->cron->toggleList['start'] : $lang->cron->toggleList['stop'], 'hiddenwin');
if(!empty($cron->command) and common::hasPriv('cron', 'edit')) echo html::a(inlink('edit', "id=$cron->id"), $lang->edit);
+1
View File
@@ -151,6 +151,7 @@ class install extends control
$this->loadModel('setting')->updateVersion($this->config->version);
$this->loadModel('setting')->setItem('system.common.global.flow', 'full');
$this->loadModel('setting')->setItem('system.common.global.cron', 1);
die(js::locate(inlink('step5'), 'parent'));
}