From 7ef44ad9fab3b866b2711eafc229cd17014e01e7 Mon Sep 17 00:00:00 2001 From: tanghucheng Date: Wed, 20 Sep 2023 21:46:20 -0400 Subject: [PATCH] * Fix bug #38808. --- module/action/model.php | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/module/action/model.php b/module/action/model.php index 22f14753a0..e4523d1f99 100755 --- a/module/action/model.php +++ b/module/action/model.php @@ -1973,6 +1973,11 @@ class actionModel extends model { $execution = $this->loadModel('execution')->getById($action->objectID); if(!empty($execution) and $execution->type == 'kanban') $action->objectLink = helper::createLink('execution', 'kanban', "executionID={$action->objectID}"); + if($execution->type == 'stage' and $execution->attribute == 'research' and $action->vision == 'or') + { + $action->objectLink = ''; + $action->objectLabel = $this->lang->execution->stage; + } } if($action->objectType == 'story') @@ -2085,6 +2090,12 @@ class actionModel extends model if(!empty($action->objectLink) and !empty($project) and empty($project->multiple)) $action->objectLink .= '#app=project'; if($this->config->vision == 'lite' and $action->objectType == 'module') $action->objectLink .= '#app=project'; + if($action->objectType == 'task' and $this->config->vision == 'or') + { + $task = $this->dao->select('*')->from(TABLE_TASK)->where('id')->eq($action->objectID)->fetch(); + if($task->type == 'research') $action->objectLink = helper::createLink('marketresearch', 'viewTask', "objectID=$action->objectID"); + } + return $action; }