Merge branch 'master_xieqiyu_66955' into 'master'

Master xieqiyu 66955 See merge request easycorp/zentaopms!5219
2022-09-01 03:05:12 +00:00
parent 5dc1b86b71 16094e64d4
commit 58c0d43da5
13 changed files with 83 additions and 12 deletions
@@ -48,6 +48,8 @@ $config->task->custom->createFields      = $config->task->customCreateFields;
 $config->task->custom->batchCreateFields = 'module,story,assignedTo,estimate,desc,pri';
 $config->task->custom->batchEditFields   = 'module,assignedTo,status,pri,estimate,record,left';

+$config->task->excludeCheckFileds = ',pri,estStartedDitto,deadlineDitto,';
+
 $config->task->datatable = new stdclass();
 $config->task->datatable->defaultField = array('id', 'pri', 'name', 'status', 'assignedTo', 'finishedBy', 'estimate', 'consumed', 'left', 'progress', 'deadline', 'actions');

@@ -353,7 +353,15 @@ class taskModel extends model
            $estStarted = (!isset($tasks->estStarted[$i]) or isset($tasks->estStartedDitto[$i])) ? $estStarted : $tasks->estStarted[$i];
            $deadline   = (!isset($tasks->deadline[$i]) or isset($tasks->deadlineDitto[$i]))     ? $deadline   : $tasks->deadline[$i];

-            if(empty($tasks->name[$i])) continue;
+            if(empty($tasks->name[$i]))
+            {
+                if($this->common->checkValidRow('task', $tasks, $i))
+                {
+                    dao::$errors['message'][] = sprintf($this->lang->error->notempty, $this->lang->task->name);
+                    return false;
+                }
+                continue;
+            }

            $data[$i]             = new stdclass();
            $data[$i]->story      = (int)$story;