From 5667c2cadebaad96169bb9331a3ba34b07b834e5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9B=B9=E5=BB=B6=E4=B9=89?= Date: Fri, 23 Sep 2022 11:22:36 +0800 Subject: [PATCH] * Fix bug #27854. --- module/task/model.php | 21 +++++++++++++++++---- 1 file changed, 17 insertions(+), 4 deletions(-) diff --git a/module/task/model.php b/module/task/model.php index cdbb008a2e..1b7d064e60 100755 --- a/module/task/model.php +++ b/module/task/model.php @@ -1805,10 +1805,23 @@ class taskModel extends model /* Fix bug#3036. */ foreach($record->consumed as $id => $item) $record->consumed[$id] = trim($item); - foreach($record->left as $id => $item) $record->left[$id] = trim($item); - foreach($record->consumed as $id => $item) if(!is_numeric($item) and !empty($item)) dao::$errors[] = 'ID #' . $id . ' ' . $this->lang->task->error->totalNumber; - foreach($record->left as $id => $item) if(!is_numeric($item) and !empty($item)) dao::$errors[] = 'ID #' . $id . ' ' . $this->lang->task->error->leftNumber; - foreach($record->dates as $id => $item) if($item > $today) dao::$errors[] = 'ID #' . $id . ' ' . $this->lang->task->error->date; + foreach($record->consumed as $id => $item) + { + if(!is_numeric($item) and !empty($item)) + { + dao::$errors[] = 'ID #' . $id . ' ' . $this->lang->task->error->totalNumber; + } + elseif(is_numeric($item) and $item <= 0) + { + dao::$errors[] = sprintf($this->lang->error->gt, 'ID #' . $id . ' ' . $this->lang->task->record, '0'); + } + } + foreach($record->left as $id => $item) + { + $record->left[$id] = trim($item); + if(!is_numeric($item) and !empty($item)) dao::$errors[] = 'ID #' . $id . ' ' . $this->lang->task->error->leftNumber; + } + foreach($record->dates as $id => $item) if($item > $today) dao::$errors[] = 'ID #' . $id . ' ' . $this->lang->task->error->date; if(dao::isError()) return false; $estimates = array();