From 2f042937f6cfdd121af9acc6d9a0af39c8ec5d3b Mon Sep 17 00:00:00 2001
From: sunguangming <sunguangming@easycorp.ltd>
Date: Wed, 23 Oct 2024 02:51:17 +0000
Subject: [PATCH]  * [task#130787,done,0.5h] finish task.

---
 module/execution/zen.php                   | 2 +-
 module/product/model.php                   | 2 +-
 module/program/zen.php                     | 2 +-
 module/project/model.php                   | 2 +-
 module/project/ui/ajaxgetdropmenu.html.php | 2 +-
 5 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/module/execution/zen.php b/module/execution/zen.php
index 592174fdd7..d27963ab8f 100644
--- a/module/execution/zen.php
+++ b/module/execution/zen.php
@@ -1577,7 +1577,7 @@ class executionZen extends execution
         if($this->config->edition != 'open')
         {
             $flow = $this->loadModel('workflow')->getByModule($module);
-            if(!empty($flow) && $flow->buildin == '0') return helper::createLink('flow', 'ajaxSwitchBelong', "objectID=%s&moduleName=$module") . '#app=execution';
+            if(!empty($flow) && $flow->buildin == '0') return helper::createLink('flow', 'ajaxSwitchBelong', "objectID=%s&moduleName=$module") . "#app=$flow->app";
         }
 
         $link = helper::createLink($module, $method, "executionID=%s");
diff --git a/module/product/model.php b/module/product/model.php
index ae5a05bb13..52f8028164 100755
--- a/module/product/model.php
+++ b/module/product/model.php
@@ -2030,7 +2030,7 @@ class productModel extends model
         if($this->config->edition != 'open')
         {
             $flow = $this->loadModel('workflow')->getByModule($module);
-            if(!empty($flow) && $flow->buildin == '0') return helper::createLink('flow', 'ajaxSwitchBelong', "objectID=%s&moduleName=$module") . '#app=product';
+            if(!empty($flow) && $flow->buildin == '0') return helper::createLink('flow', 'ajaxSwitchBelong', "objectID=%s&moduleName=$module") . "app=$flow->app";
         }
 
         if($module == 'execution'  && in_array($method, array('bug', 'testcase')))                       return helper::createLink($module,    $method,  "executionID={$params[0]}&productID=%s{$branchParam}");
diff --git a/module/program/zen.php b/module/program/zen.php
index 70f27d4238..02b0590f0f 100644
--- a/module/program/zen.php
+++ b/module/program/zen.php
@@ -362,7 +362,7 @@ class programZen extends program
         if($this->config->edition != 'open')
         {
             $flow = $this->loadModel('workflow')->getByModule($moduleName);
-            if(!empty($flow) && $flow->buildin == '0') return helper::createLink('flow', 'ajaxSwitchBelong', "objectID=$programID&moduleName=$moduleName") . '#app=program';
+            if(!empty($flow) && $flow->buildin == '0') return helper::createLink('flow', 'ajaxSwitchBelong', "objectID=$programID&moduleName=$moduleName") . "#app=$flow->app";
         }
         if($moduleName == 'project')
         {
diff --git a/module/project/model.php b/module/project/model.php
index 90a102fb16..ae0e04c76b 100755
--- a/module/project/model.php
+++ b/module/project/model.php
@@ -513,7 +513,7 @@ class projectModel extends model
         if($this->config->edition != 'open')
         {
             $flow = $this->loadModel('workflow')->getByModule($module);
-            if(!empty($flow) && $flow->buildin == '0') return helper::createLink('flow', 'ajaxSwitchBelong', "objectID=%s&moduleName=$module") . '#app=project';
+            if(!empty($flow) && $flow->buildin == '0') return helper::createLink('flow', 'ajaxSwitchBelong', "objectID=%s&moduleName=$module") . "#app=$flow->app";
         }
 
         if(in_array($module, $this->config->waterfallModules)) return helper::createLink($module, 'browse', "projectID=%s");
diff --git a/module/project/ui/ajaxgetdropmenu.html.php b/module/project/ui/ajaxgetdropmenu.html.php
index fb3627710a..b5ac7621c1 100644
--- a/module/project/ui/ajaxgetdropmenu.html.php
+++ b/module/project/ui/ajaxgetdropmenu.html.php
@@ -67,7 +67,7 @@ foreach($projects as $programID => $programProjects)
         $item['keys'] = zget(common::convert2Pinyin(array($project->name)), $project->name, '');
         $item['url']  = sprintf($link, $project->id);
 
-        if(empty($project->multiple) || $project->type == 'kanban' || $project->model == 'kanban') $item['url'] = helper::createLink('project', 'index', "projectID={$project->id}");
+        if((empty($project->multiple) || $project->type == 'kanban' || $project->model == 'kanban') && strpos($link, 'ajaxSwitchBelong') === false) $item['url'] = helper::createLink('project', 'index', "projectID={$project->id}");
 
         if(empty($activeGroup) && $projectID == $project->id) $activeGroup = $group;