diff --git a/module/product/control.php b/module/product/control.php index 66506b710b..af1e786a06 100644 --- a/module/product/control.php +++ b/module/product/control.php @@ -975,7 +975,7 @@ class product extends control */ public function showErrorNone($moduleName = 'qa', $activeMenu = 'index', $projectID = 0) { - $this->app->rawModule = $moduleName; + $this->app->rawModule = $activeMenu; if($moduleName == 'project') { $this->loadModel('project')->setMenu($projectID); @@ -986,12 +986,11 @@ class product extends control if($activeMenu == 'testcase') $this->lang->{$project->model}->menu->qa['subMenu']->testcase['subModule'] = 'product'; if($activeMenu == 'bug') $this->lang->{$project->model}->menu->qa['subMenu']->bug['subModule'] = 'product'; - if($activeMenu == 'testcase') $this->lang->{$project->model}->menu->qa['subMenu']->testtask['subModule'] = 'product'; + if($activeMenu == 'testtask') $this->lang->{$project->model}->menu->qa['subMenu']->testtask['subModule'] = 'product'; } elseif($moduleName == 'qa') { $this->loadModel('qa')->setMenu(array(), 0); - foreach($this->config->qa->menuList as $module) $this->lang->navGroup->$module = 'qa'; if($activeMenu == 'testcase') $this->lang->qa->menu->testcase['subMenu']->case['subModule'] = 'product'; if($activeMenu == 'testsuite') $this->lang->qa->menu->testcase['subMenu']->testsuite['subModule'] = 'product'; diff --git a/module/testsuite/control.php b/module/testsuite/control.php index af2d0fa9e3..a2b287ddf2 100644 --- a/module/testsuite/control.php +++ b/module/testsuite/control.php @@ -31,9 +31,6 @@ class testsuite extends control { parent::__construct($moduleName, $methodName); - $this->app->loadConfig('qa'); - foreach($this->config->qa->menuList as $module) $this->lang->navGroup->$module = 'qa'; - $this->view->products = $this->products = $this->loadModel('product')->getPairs(); if(empty($this->products)) die($this->locate($this->createLink('product', 'showErrorNone', "moduleName=qa&activeMenu=testsuite"))); } diff --git a/module/testtask/control.php b/module/testtask/control.php index 1c633af3af..7dad4d4a42 100644 --- a/module/testtask/control.php +++ b/module/testtask/control.php @@ -46,7 +46,7 @@ class testtask extends control } if($this->app->openApp == 'qa') { - $products = $this->product->getPairs(); + $products = $this->loadModel('product')->getPairs(); $this->app->loadConfig('qa'); foreach($this->config->qa->menuList as $module) $this->lang->navGroup->$module = 'qa'; }