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

+ [feedback#8667,start,0.1h] append workflow date fields to dateFields.

Browse Source
This commit is contained in:
liumengyi
2025-03-11 09:15:31 +08:00
committed by 田淑杰
parent 5605663899
commit 65f1b864c8
1 changed files with 25 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/task/model.php
+25
View File
@@ -606,6 +606,15 @@ class taskModel extends model
$this->loadModel('action');
$this->loadModel('score');
if($this->config->edition != 'open')
{
$fieldList = $this->loadModel('workflowfield')->getList('task');
foreach($fieldList as $field)
{
if($field->type == 'date' || $field->type == 'datetime') $this->config->task->dateFields[] = $field->field;
}
}
$allChanges = array();
$oldTasks = $taskData ? $this->getByIdList(array_keys($taskData)) : array();
foreach($taskData as $taskID => $task)
@@ -2745,6 +2754,14 @@ class taskModel extends model
$task->teamMembers = implode(',', array_keys($teamMembers));
}
if($this->config->edition != 'open')
{
$fieldList = $this->loadModel('workflowfield')->getList('task');
foreach($fieldList as $field)
{
if($field->type == 'date' || $field->type == 'datetime') $this->config->task->dateFields[] = $field->field;
}
}
foreach($task as $field => $value)
{
if(in_array($field, $this->config->task->dateFields) && helper::isZeroDate($value)) $task->$field = '';
@@ -2845,6 +2862,14 @@ class taskModel extends model
/* Update task and do other operations. */
if($allChanges)
{
if($this->config->edition != 'open')
{
$fieldList = $this->loadModel('workflowfield')->getList('task');
foreach($fieldList as $field)
{
if($field->type == 'date' || $field->type == 'datetime') $this->config->task->dateFields[] = $field->field;
}
}
foreach($this->config->task->dateFields as $field) if(empty($task->$field)) unset($task->$field);
$this->dao->update(TABLE_TASK)->data($task, 'team')->where('id')->eq($taskID)->exec();