From cd8a2f59726b5b921aa5f46ae284e50a98e86c7a Mon Sep 17 00:00:00 2001
From: liumengyi <liumengyi@easycorp.ltd>
Date: Thu, 16 May 2024 10:46:43 +0800
Subject: [PATCH] * Fix bug #49313.

---
 module/todo/control.php |  1 +
 module/todo/zen.php     | 11 ++++++-----
 2 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/module/todo/control.php b/module/todo/control.php
index 62d46679db..381e1739c0 100755
--- a/module/todo/control.php
+++ b/module/todo/control.php
@@ -185,6 +185,7 @@ class todo extends control
         /* Save the todo data for batch edit. */
         if($from == 'todoBatchEdit')
         {
+            $this->config->todo->edit->requiredFields = str_replace(',name,', ',', ",{$this->config->todo->edit->requiredFields},");
             $formData   = form::batchData($this->config->todo->batchEdit->form)->get();
             $todos      = $this->todoZen->beforeBatchEdit($formData);
             if(dao::isError()) return $this->send(array('result' => 'fail', 'message' => dao::getError()));
diff --git a/module/todo/zen.php b/module/todo/zen.php
index 2e5b5d88bf..ba71086198 100755
--- a/module/todo/zen.php
+++ b/module/todo/zen.php
@@ -488,17 +488,18 @@ class todoZen extends todo
             {
                 $todo->objectID   = $todo->{$todo->type};
                 $todo->name       = '';
+                if(empty($todo->objectID)) dao::$errors["{$todo->type}[{$todoID}]"] = sprintf($this->lang->error->notempty, $this->lang->todo->name);
+            }
+            elseif(empty($todo->name))
+            {
+                dao::$errors["name[{$todoID}]"] = sprintf($this->lang->error->notempty, $this->lang->todo->name);
             }
             unset($todo->story, $todo->task, $todo->bug, $todo->testtask);
 
             $todo->begin = empty($todo->begin) || $this->post->switchTime ? 2400 : $todo->begin;
             $todo->end   = empty($todo->end) || $this->post->switchTime   ? 2400 : $todo->end;
 
-            if($todo->end < $todo->begin)
-            {
-                dao::$errors["begin[{$todoID}]"] = sprintf($this->lang->error->gt, $this->lang->todo->end, $this->lang->todo->begin);
-                continue;
-            }
+            if($todo->end < $todo->begin) dao::$errors["begin[{$todoID}]"] = sprintf($this->lang->error->gt, $this->lang->todo->end, $this->lang->todo->begin);
         }
 
         return $todos;