From 6e8bcc7bed4fa76da5ba85fb22c1d0da7bf10617 Mon Sep 17 00:00:00 2001 From: liugang Date: Tue, 12 Sep 2023 10:19:50 +0800 Subject: [PATCH] * testtaskModel: check if the action can be executed based on the isClickable method. --- module/testtask/model.php | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/module/testtask/model.php b/module/testtask/model.php index 81eb656da2..6c626f36a1 100755 --- a/module/testtask/model.php +++ b/module/testtask/model.php @@ -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;