diff --git a/module/execution/zen.php b/module/execution/zen.php index cbd9d1e9fa..c0034f7304 100644 --- a/module/execution/zen.php +++ b/module/execution/zen.php @@ -1595,7 +1595,7 @@ class executionZen extends execution if($this->config->edition != 'open') { $flow = $this->loadModel('workflow')->getByModule($module); - if(!empty($flow) && in_array($flow->app, array('scrum', 'waterfall'))) $flow->app = 'project'; + if(!empty($flow) && in_array($flow->app, array('scrum', 'waterfall', 'kanbanProject'))) $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 fc65cee63c..cec20eb7f6 100755 --- a/module/product/model.php +++ b/module/product/model.php @@ -2062,7 +2062,7 @@ class productModel extends model if($this->config->edition != 'open') { $flow = $this->loadModel('workflow')->getByModule($module); - if($flow && in_array($flow->app, array('scrum', 'waterfall'))) $flow->app = 'project'; + if($flow && in_array($flow->app, array('scrum', 'waterfall', 'kanbanProject'))) $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 bbd484805f..acea7c69f8 100644 --- a/module/program/zen.php +++ b/module/program/zen.php @@ -361,7 +361,7 @@ class programZen extends program if($this->config->edition != 'open') { $flow = $this->loadModel('workflow')->getByModule($moduleName); - if($flow && in_array($flow->app, array('scrum', 'waterfall'))) $flow->app = 'project'; + if($flow && in_array($flow->app, array('scrum', 'waterfall', 'kanbanProject'))) $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 e7e8dfc0de..1e11f9deb6 100755 --- a/module/project/model.php +++ b/module/project/model.php @@ -642,7 +642,7 @@ class projectModel extends model if($this->config->edition != 'open') { $flow = $this->loadModel('workflow')->getByModule($module); - if(!empty($flow->app) && in_array($flow->app, array('scrum', 'waterfall'))) $flow->app = 'project'; + if(!empty($flow->app) && in_array($flow->app, array('scrum', 'waterfall', 'kanbanProject'))) $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/project/test/model/getprojectlink.php b/module/project/test/model/getprojectlink.php index 0750c55cbf..671f7eef6b 100644 --- a/module/project/test/model/getprojectlink.php +++ b/module/project/test/model/getprojectlink.php @@ -12,6 +12,53 @@ title=测试 projectModel->getProjectLink(); timeout=0 cid=1 +- test project->multiple=0 @1 +- 执行projectModel模块的getProjectLink方法,参数是'project', 'execution' , 12)) > 0 @1 +- 执行projectModel模块的getProjectLink方法,参数是'project', 'test' , 12)) > 0 @1 +- 执行projectModel模块的getProjectLink方法,参数是'project', 'bug' , 12)) > 0 @1 +- 执行projectModel模块的getProjectLink方法,参数是'project', 'testcase' , 12)) > 0 @1 +- 执行projectModel模块的getProjectLink方法,参数是'project', 'testtask' , 12)) > 0 @1 +- 执行projectModel模块的getProjectLink方法,参数是'project', 'testreport' , 12)) > 0 @1 +- 执行projectModel模块的getProjectLink方法,参数是'project', 'build' , 12)) > 0 @1 +- 执行projectModel模块的getProjectLink方法,参数是'project', 'dynamic' , 12)) > 0 @1 +- 执行projectModel模块的getProjectLink方法,参数是'project', 'view' , 12)) > 0 @1 +- 执行projectModel模块的getProjectLink方法,参数是'project', 'manageproducts', 12)) > 0 @1 +- 执行projectModel模块的getProjectLink方法,参数是'project', 'team' , 12)) > 0 @1 +- 执行projectModel模块的getProjectLink方法,参数是'project', 'managemembers' , 12)) > 0 @1 +- 执行projectModel模块的getProjectLink方法,参数是'project', 'whitelist' , 12)) > 0 @1 +- 执行projectModel模块的getProjectLink方法,参数是'project', 'addwhitelist' , 12)) > 0 @1 +- 执行projectModel模块的getProjectLink方法,参数是'project', 'group' , 12)) > 0 @1 +- 执行projectModel模块的getProjectLink方法,参数是'project', 'managePriv' , 12)) > 0 @1 +- 执行projectModel模块的getProjectLink方法,参数是'product', 'showerrornone', 12)) > 0 @1 +- 执行projectModel模块的getProjectLink方法,参数是'projectstory', 'story' , 12)) > 0 @1 +- 执行projectModel模块的getProjectLink方法,参数是'projectstory', 'linkstory', 12)) > 0 @1 +- 执行projectModel模块的getProjectLink方法,参数是'projectstory', 'track' , 12)) > 0 @1 +- 执行projectModel模块的getProjectLink方法,参数是'bug', 'create', 12)) > 0 @1 +- 执行projectModel模块的getProjectLink方法,参数是'bug', 'edit' , 12)) > 0 @1 +- 执行projectModel模块的getProjectLink方法,参数是'story', 'change' , 12)) > 0 @1 +- 执行projectModel模块的getProjectLink方法,参数是'story', 'create' , 12)) > 0 @1 +- 执行projectModel模块的getProjectLink方法,参数是'story', 'zerocase', 12)) > 0 @1 +- 执行projectModel模块的getProjectLink方法,参数是'testcase', 'browse', 12)) > 0 @1 +- 执行projectModel模块的getProjectLink方法,参数是'testtask', 'browseunits' , 12)) > 0 @1 +- 执行projectModel模块的getProjectLink方法,参数是'testtask', 'browse' , 12)) > 0 @1 +- 执行projectModel模块的getProjectLink方法,参数是'testreport', 'browse', 12)) > 0 @1 +- 执行projectModel模块的getProjectLink方法,参数是'repo', 'browse', 12)) > 0 @1 +- 执行projectModel模块的getProjectLink方法,参数是'doc', 'browse', 12)) > 0 @1 +- 执行projectModel模块的getProjectLink方法,参数是'api', 'browse', 12)) > 0 @1 +- 执行projectModel模块的getProjectLink方法,参数是'build', 'create', 12)) > 0 @1 +- 执行projectModel模块的getProjectLink方法,参数是'build', 'browse', 12)) > 0 @1 +- 执行projectModel模块的getProjectLink方法,参数是'build', 'browse', 12)) > 0 @1 +- 执行projectModel模块的getProjectLink方法,参数是'projectrelease', 'create', 12)) > 0 @1 +- 执行projectModel模块的getProjectLink方法,参数是'projectrelease', 'browse', 12)) > 0 @1 +- 执行projectModel模块的getProjectLink方法,参数是'stakeholder', 'create', 12)) > 0 @1 +- 执行projectModel模块的getProjectLink方法,参数是'stakeholder', 'browse', 12)) > 0 @1 +- 执行projectModel模块的getProjectLink方法,参数是'issue', 'projectsummary', 11)) > 0 @1 +- 执行projectModel模块的getProjectLink方法,参数是'issue', 'browse' , 12)) > 0 @1 +- 执行projectModel模块的getProjectLink方法,参数是'zahost', 'browse', 12)) > 0 @1 +- 执行projectModel模块的getProjectLink方法,参数是'design', 'browse', 12)) > 0 @1 +- 执行projectModel模块的getProjectLink方法,参数是'reviewissue', 'browse', 12)) > 0 @1 +- 执行projectModel模块的getProjectLink方法,参数是'programplan', 'execution', 12)) > 0 @1 + */ global $tester;