From 8bbf77788a4d151108ac82b5f8dab7e784853ee3 Mon Sep 17 00:00:00 2001 From: tianshujie Date: Tue, 18 Oct 2022 14:34:29 +0800 Subject: [PATCH] * Finish task #72348. --- module/task/js/activate.js | 4 ++-- module/task/model.php | 6 ++++++ 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/module/task/js/activate.js b/module/task/js/activate.js index 9987ff3b5a..6f3b085f86 100644 --- a/module/task/js/activate.js +++ b/module/task/js/activate.js @@ -16,7 +16,7 @@ $('#confirmButton').click(function() var estimate = parseFloat($tr.find('[name^=teamEstimate]').val()); if(!isNaN(estimate)) totalEstimate += estimate; - if($tr.hasClass('member-wait') && (isNaN(estimate) || estimate == 0)) + if($tr.hasClass('member-wait') && (isNaN(estimate) || estimate <= 0)) { bootbox.alert(account + ' ' + estimateNotEmpty); error = true; @@ -29,7 +29,7 @@ $('#confirmButton').click(function() var $left = $tr.find('[name^=teamLeft]'); var left = parseFloat($left.val()); if(!isNaN(left)) totalLeft += left; - if(!$left.prop('readonly') && $tr.hasClass('member-wait') && (isNaN(left) || left == 0)) + if(!$left.prop('readonly') && $tr.hasClass('member-wait') && (isNaN(left) || left <= 0)) { bootbox.alert(account + ' ' + leftNotEmpty); error = true; diff --git a/module/task/model.php b/module/task/model.php index 34aaffe3ce..42f3304c0e 100755 --- a/module/task/model.php +++ b/module/task/model.php @@ -2283,6 +2283,12 @@ class taskModel extends model return false; } + if(empty($task->left)) + { + dao::$errors[] = sprintf($this->lang->task->error->notempty, $this->lang->task->left); + return false; + } + if(!empty($oldTask->team)) { $this->manageTaskTeam($oldTask->mode, $oldTask->id, $task->status);