From e1c80fcceefab4227f1e90a4b32dcd2aee1a94eb Mon Sep 17 00:00:00 2001 From: sunguangming Date: Fri, 25 Oct 2024 02:42:08 +0000 Subject: [PATCH] * [bug] fix drop menu app bug. --- module/execution/zen.php | 1 + module/product/model.php | 1 + module/program/zen.php | 1 + module/project/model.php | 1 + 4 files changed, 4 insertions(+) diff --git a/module/execution/zen.php b/module/execution/zen.php index b153684117..7a37f802ad 100644 --- a/module/execution/zen.php +++ b/module/execution/zen.php @@ -1576,6 +1576,7 @@ class executionZen extends execution if($this->config->edition != 'open') { $flow = $this->loadModel('workflow')->getByModule($module); + if(in_array($flow->app, array('scrum', 'waterfall'))) $flow->app = 'project'; if(!empty($flow) && $flow->buildin == '0') return helper::createLink('flow', 'ajaxSwitchBelong', "objectID=%s&moduleName=$module") . "#app=$flow->app"; } diff --git a/module/product/model.php b/module/product/model.php index 52f8028164..43d781e117 100755 --- a/module/product/model.php +++ b/module/product/model.php @@ -2030,6 +2030,7 @@ class productModel extends model if($this->config->edition != 'open') { $flow = $this->loadModel('workflow')->getByModule($module); + if(in_array($flow->app, array('scrum', 'waterfall'))) $flow->app = 'project'; if(!empty($flow) && $flow->buildin == '0') return helper::createLink('flow', 'ajaxSwitchBelong', "objectID=%s&moduleName=$module") . "app=$flow->app"; } diff --git a/module/program/zen.php b/module/program/zen.php index 1884942162..989a8bb222 100644 --- a/module/program/zen.php +++ b/module/program/zen.php @@ -360,6 +360,7 @@ class programZen extends program if($this->config->edition != 'open') { $flow = $this->loadModel('workflow')->getByModule($moduleName); + if(in_array($flow->app, array('scrum', 'waterfall'))) $flow->app = 'project'; 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 827c218453..c936f35b59 100755 --- a/module/project/model.php +++ b/module/project/model.php @@ -571,6 +571,7 @@ class projectModel extends model if($this->config->edition != 'open') { $flow = $this->loadModel('workflow')->getByModule($module); + if(in_array($flow->app, array('scrum', 'waterfall'))) $flow->app = 'project'; if(!empty($flow) && $flow->buildin == '0') return helper::createLink('flow', 'ajaxSwitchBelong', "objectID=%s&moduleName=$module") . "#app=$flow->app"; }