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

Merge branch 'sprint/215_liumengyi_23641' into 'master'

Browse Source 
* Fix bug #23641.

See merge request easycorp/zentaopms!4516
This commit is contained in:
王怡栋
2022-07-13 06:48:13 +00:00
parent b9a6b4a2cc db19c66db3
commit 5f062e08f9
1 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/task/model.php
+8 -8
View File
@@ -1239,8 +1239,8 @@ class taskModel extends model
if(empty($task->closedReason))
{
if($oldTask->status == 'done') $task->closedReason = 'done';
if($oldTask->status == 'cancel') $task->closedReason = 'cancel';
if($oldTask->status == 'done' and $task->status == 'closed') $task->closedReason = 'done';
if($oldTask->status == 'cancel' and $task->status == 'closed') $task->closedReason = 'cancel';
}
if($oldTask->name != $task->name || $oldTask->estStarted != $task->estStarted || $oldTask->deadline != $task->deadline)
@@ -3749,13 +3749,13 @@ class taskModel extends model
/**
* Build nested list.
*
* @param objecct $execution
* @param object $task
* @param bool $isChild
* @param bool $showmore
*
* @param objecct $execution
* @param object $task
* @param bool $isChild
* @param bool $showmore
* @access public
* @return string
* @return string
*/
public function buildNestedList($execution, $task, $isChild = false, $showmore = false, $users)
{