From 478b7ff0971e36105fe2771f801a4b4124d6b4ec Mon Sep 17 00:00:00 2001
From: wangyidong <yidong@cnezsoft.com>
Date: Tue, 4 Sep 2018 11:32:33 +0800
Subject: [PATCH]  * finish task #4829.

---
 module/task/model.php | 14 +++++++++++---
 1 file changed, 11 insertions(+), 3 deletions(-)

diff --git a/module/task/model.php b/module/task/model.php
index f820fde788..2ac6147934 100644
--- a/module/task/model.php
+++ b/module/task/model.php
@@ -173,7 +173,7 @@ class taskModel extends model
             else
             {
                 dao::$errors['message'][] = sprintf($this->lang->duplicate, $this->lang->task->common);
-                die(js::error(dao::getError()));
+                return false;
             }
         }
 
@@ -229,11 +229,19 @@ class taskModel extends model
         /* check data. */
         foreach($data as $i => $task)
         {
-            if($task->estimate and !preg_match("/^[0-9]+(.[0-9]{1,3})?$/", $task->estimate)) die(js::alert($this->lang->task->error->estimateNumber));
+            if($task->estimate and !preg_match("/^[0-9]+(.[0-9]{1,3})?$/", $task->estimate))
+            {
+                dao::$errors['message'][] = $this->lang->task->error->estimateNumber;
+                return false;
+            }
             foreach(explode(',', $requiredFields) as $field)
             {
                 $field = trim($field);
-                if($field and empty($task->$field)) die(js::alert(sprintf($this->lang->error->notempty, $this->lang->task->$field)));
+                if($field and empty($task->$field))
+                {
+                    dao::$errors['message'][] = sprintf($this->lang->error->notempty, $this->lang->task->$field);
+                    return false;
+                }
             }
             if($task->estimate) $task->estimate = (float)$task->estimate;
         }