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

Merge branch '15.0'

Browse Source
This commit is contained in:
wangyidong
2021-07-06 19:28:30 +08:00
parent 1d11be7552 396954c678
commit fa4fa5941e
165 changed files with 4714 additions and 440 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/todo/model.php
+8 -1
View File
@@ -213,7 +213,6 @@ class todoModel extends model
public function update($todoID)
{
$oldTodo = $this->dao->findById((int)$todoID)->from(TABLE_TODO)->fetch();
if(in_array($oldTodo->type, $this->config->todo->moduleList)) $oldTodo->name = '';
$objectType = $this->post->type;
$hasObject = in_array($objectType, $this->config->todo->moduleList);
@@ -231,6 +230,14 @@ class todoModel extends model
->remove(implode(',', $this->config->todo->moduleList) . ',uid')
->get();
if($todo->type != 'custom')
{
$type = $todo->type;
$object = $this->loadModel($type)->getByID($objectType);
if(isset($object->name)) $todo->name = $object->name;
if(isset($object->title)) $todo->name = $object->title;
}
if($todo->end < $todo->begin)
{
dao::$errors[] = sprintf($this->lang->error->gt, $this->lang->todo->end, $this->lang->todo->begin);