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

This commit is contained in:
wangyidong
2017-11-09 13:46:49 +08:00
14 changed files with 70 additions and 53 deletions
+3 -3
View File
@@ -473,7 +473,7 @@ class task extends control
$this->action->logHistory($actionID, $changes);
$this->task->sendmail($taskID, $actionID);
}
$this->loadModel('score')->create('ajax', 'batchOther');
if(!dao::isError()) $this->loadModel('score')->create('ajax', 'batchOther');
}
die(js::reload('parent'));
}
@@ -503,7 +503,7 @@ class task extends control
$this->action->logHistory($actionID, $changes);
$this->task->sendmail($taskID, $actionID);
}
$this->loadModel('score')->create('ajax', 'batchOther');
if(!dao::isError()) $this->loadModel('score')->create('ajax', 'batchOther');
die(js::reload('parent'));
}
}
@@ -972,7 +972,7 @@ class task extends control
$cancelURL = $this->server->HTTP_REFERER;
die(js::confirm(sprintf($this->lang->task->error->skipClose, $skipTasks), $confirmURL, $cancelURL, 'self', 'parent'));
}
$this->loadModel('score')->create('ajax', 'batchOther');
if(!dao::isError()) $this->loadModel('score')->create('ajax', 'batchOther');
}
die(js::reload('parent'));
}