From 0aba204fbf258b7a3afe2bf4583da517bd73d9a2 Mon Sep 17 00:00:00 2001 From: liumengyi Date: Thu, 13 Jan 2022 11:58:28 +0800 Subject: [PATCH] * Fix bug for kanban execution. --- module/action/model.php | 6 ++++++ module/kanban/model.php | 4 ++-- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/module/action/model.php b/module/action/model.php index ae8211fbd8..e819d4e5cf 100755 --- a/module/action/model.php +++ b/module/action/model.php @@ -1290,6 +1290,12 @@ class actionModel extends model } $action->objectLink = helper::createLink($moduleName, $methodName, $params); + if($action->objectType == 'execution') + { + $execution = $this->loadModel('execution')->getById($action->objectID); + if($execution->type == 'kanban') $action->objectLink = helper::createLink('execution', 'kanban', "executionID={$action->objectID}"); + } + if($action->objectType == 'doclib') { $docLib = $this->dao->select('type,product,project,execution,deleted')->from(TABLE_DOCLIB)->where('id')->eq($action->objectID)->fetch(); diff --git a/module/kanban/model.php b/module/kanban/model.php index 25a5f3a914..a0a009b932 100644 --- a/module/kanban/model.php +++ b/module/kanban/model.php @@ -1373,7 +1373,7 @@ class kanbanModel extends model if(dao::isError()) return false; $laneID = $this->dao->lastInsertID(); - if($lane->type != 'common' and $mode == 'independent') $this->createRDColumn($regionID, $lane->group, $laneID, $lane->type); + if($lane->type != 'common' and $mode == 'independent') $this->createRDColumn($regionID, $lane->group, $laneID, $lane->type, $kanbanID); return $laneID; } @@ -1830,7 +1830,7 @@ class kanbanModel extends model if($type == 'test') $testColumnID = $this->dao->lastInsertId(); if($type == 'resolving') $resolvingColumnID = $this->dao->lastInsertId(); - $this->addKanbanCell($executionID, $laneID, $this->dao->lastInsertId(), $laneType); + if($this->app->rawMethod == 'createRDKanban') $this->addKanbanCell($executionID, $laneID, $this->dao->lastInsertId(), $laneType); } }