Design/EasySoft-ZenTaoPMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 30 Wiki Activity

* testtaskModel: check if the action can be executed based on the isClickable method.

Browse Source
This commit is contained in:
liugang
2023-09-12 10:19:50 +08:00
parent 0eb613d617
commit 6e8bcc7bed
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/testtask/model.php
+3 -3
View File
@@ -777,7 +777,7 @@ class testtaskModel extends model
{
$taskID = (int)$task->id;
$oldTask = $this->fetchByID($taskID);
if(!$oldTask || $oldTask->status != 'wait') return false;
if(!$oldTask || !self::isClickable($oldTask, 'start')) return false;
$this->dao->update(TABLE_TESTTASK)->data($task, 'comment,uid')
->autoCheck()
@@ -806,9 +806,9 @@ class testtaskModel extends model
*/
public function close(object $task): bool
{
$taskID = (int)$task->id;
$taskID = (int)$task->id;
$oldTask = $this->fetchByID($taskID);
if(!$oldTask || $oldTask->status == 'done') return false;
if(!$oldTask || !self::isClickable($oldTask, 'close')) return false;
if($task->realFinishedDate <= $oldTask->begin) dao::$errors['realFinishedDate'][] = sprintf($this->lang->testtask->finishedDateLess, $oldTask->begin);
if($task->realFinishedDate > date("Y-m-d 00:00:00", strtotime("+1 day"))) dao::$errors['realFinishedDate'][] = $this->lang->testtask->finishedDateMore;