Design/EasySoft-ZenTaoPMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 30 Wiki Activity

* Fix bug #49313.

Browse Source
This commit is contained in:
liumengyi
2024-05-16 10:46:43 +08:00
parent 0515804d40
commit cd8a2f5972
2 changed files with 7 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/todo/control.php
+1
View File
@@ -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()));
module/todo/zen.php
+6 -5
View File
@@ -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;