From 2e454b1415c8c44643c2f817c808741e063ae658 Mon Sep 17 00:00:00 2001 From: sgm0422 <976204163@qq.com> Date: Tue, 14 Jul 2020 11:21:12 +0800 Subject: [PATCH] * Finish task #7429. --- module/task/lang/en.php | 1 + module/task/lang/zh-cn.php | 1 + module/task/model.php | 1 + 3 files changed, 3 insertions(+) diff --git a/module/task/lang/en.php b/module/task/lang/en.php index d646b9e83d..c60acf7ba3 100644 --- a/module/task/lang/en.php +++ b/module/task/lang/en.php @@ -211,6 +211,7 @@ $lang->task->error->consumed = 'Task: %s hour must be < 0. Ignore change $lang->task->error->assignedTo = 'Multi-user task in the current status cannot be assigned to a member who is not in the task team.'; $lang->task->error->consumedEmpty = '"Current Cost" should not be empty.'; $lang->task->error->deadlineSmall = '"Deadline" must be greater than "StartDate".'; +$lang->task->error->alreadyStarted = 'You cannot start this task, because it is started.'; /* Report. */ $lang->task->report = new stdclass(); diff --git a/module/task/lang/zh-cn.php b/module/task/lang/zh-cn.php index 1c8e9a873c..727e17b0c9 100644 --- a/module/task/lang/zh-cn.php +++ b/module/task/lang/zh-cn.php @@ -211,6 +211,7 @@ $lang->task->error->consumed = '任务:%s工时不能小于0,忽略 $lang->task->error->assignedTo = '当前状态的多人任务不能指派给任务团队外的成员。'; $lang->task->error->consumedEmpty = '"本次消耗"不能为空'; $lang->task->error->deadlineSmall = '"截止日期"必须大于"预计开始"'; +$lang->task->error->alreadyStarted = '此任务已被启动,不能重复启动!'; /* Report. */ $lang->task->report = new stdclass(); diff --git a/module/task/model.php b/module/task/model.php index 93e573fb50..74510c50d2 100644 --- a/module/task/model.php +++ b/module/task/model.php @@ -1208,6 +1208,7 @@ class taskModel extends model public function start($taskID) { $oldTask = $this->getById($taskID); + if($oldTask->status == 'doing') dao::$errors[] = $this->lang->task->error->alreadyStarted; if(!empty($oldTask->team)) { if($this->post->consumed < $oldTask->team[$this->app->user->account]->consumed) dao::$errors['consumed'] = $this->lang->task->error->consumedSmall;