diff --git a/lib/zin/wg/detail/v1.php b/lib/zin/wg/detail/v1.php index 9cfb643163..d8856bda6c 100644 --- a/lib/zin/wg/detail/v1.php +++ b/lib/zin/wg/detail/v1.php @@ -214,6 +214,7 @@ CSS; set::object($object), set::title($title), set::titleClass('text-lg text-clip font-bold'), + set::titleProps(array('title' => $title)), set::type($objectType), set::color($color), set::parentTitleClass('text-lg text-clip font-bold'), diff --git a/module/task/model.php b/module/task/model.php index 0b65701f4d..47c6430a12 100755 --- a/module/task/model.php +++ b/module/task/model.php @@ -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; } diff --git a/module/task/test/model/afterstart.php b/module/task/test/model/afterstart.php index a5ef11427f..1dbf21472c 100755 --- a/module/task/test/model/afterstart.php +++ b/module/task/test/model/afterstart.php @@ -4,6 +4,7 @@ include dirname(__FILE__, 5) . '/test/lib/init.php'; include dirname(__FILE__, 2) . '/lib/task.unittest.class.php'; su('admin'); +zenData('bug')->gen(5); zenData('project')->loadYaml('project')->gen(6); zenData('task')->loadYaml('task')->gen(9); zenData('taskteam')->loadYaml('taskteam')->gen(6);