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

Merge branch 'release/21.7.8' into release/22.0.alpha1

Browse Source
This commit is contained in:
sunguangming
2025-12-29 07:52:33 +00:00
parent 5523416ed7 0109f278aa
commit e0e06d9ca3
268 changed files with 2652 additions and 1693 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/task/model.php
+8 -1
View File
@@ -344,6 +344,7 @@ class taskModel extends model
$this->afterChangeStatus($oldTask, $changes, $action, $output);
/* Send Webhook notifications and synchronize status to execution, project and program. */
$oldExecution = $this->loadModel('execution')->fetchByID($oldTask->execution);
$this->executeHooks($oldTask->id);
$this->loadModel('common')->syncPPEStatus($oldTask->id);
@@ -354,6 +355,12 @@ class taskModel extends model
if($response) return $response;
}
if($oldExecution->status == 'wait')
{
$inLiteKanban = $this->config->vision == 'lite' && $this->app->tab == 'project' && $this->session->kanbanview == 'kanban';
if(($this->app->tab == 'execution' || $inLiteKanban) && $oldExecution->type == 'kanban') return array('result' => 'success', 'message' => $this->lang->saveSuccess, 'load' => true);
}
return true;
}
@@ -2305,7 +2312,7 @@ class taskModel extends model
if($appendParent)
{
$parentTasks = $this->dao->select('id,assignedTo,finishedBy,mailto')->from(TABLE_TASK)->where('id')->in($task->path)->andWhere('id')->ne($task->id)->fetchAll('id');
$parentTasks = $this->dao->select('id,assignedTo,openedBy,finishedBy,mailto')->from(TABLE_TASK)->where('id')->in($task->path)->andWhere('id')->ne($task->id)->fetchAll('id');
foreach($parentTasks as $parentTask)
{
$parentAssignedTo = $parentTask->assignedTo;