diff --git a/module/bug/control.php b/module/bug/control.php index 8ea841bca4..1009890644 100644 --- a/module/bug/control.php +++ b/module/bug/control.php @@ -682,11 +682,10 @@ class bug extends control if($bug->assignedTo == $this->app->user->account) $this->loadModel('action')->read('bug', $bugID); /* Set menu. */ - if($from == 'bug') - { - $this->qa->setMenu($this->products, $bug->product, $bug->branch); - } - elseif($from == 'repo') + if($this->app->openApp == 'project') $this->loadModel('project')->setMenu($bug->project); + if($this->app->openApp == 'execution') $this->loadModel('execution')->setMenu($bug->execution); + if($this->app->openApp == 'qa') $this->qa->setMenu($this->products, $bug->product, $bug->branch); + if($this->app->openApp == 'repo') { session_write_close(); $repos = $this->loadModel('repo')->getRepoPairs($this->session->project); diff --git a/module/common/lang/de.php b/module/common/lang/de.php index 3f8f259c21..89330d0af7 100644 --- a/module/common/lang/de.php +++ b/module/common/lang/de.php @@ -312,7 +312,7 @@ $lang->my->workMenu->testtask = 'Test Task|my|work|mode=testtask&type=wait'; $lang->my->contributeMenu = new stdclass(); $lang->my->contributeMenu->task = 'Task|my|contribute|mode=task'; -f($config->URAndSR) $lang->my->contributeMenu->requirement = "$lang->URCommon|my|contribute|mode=requirement"; +if($config->URAndSR) $lang->my->contributeMenu->requirement = "$lang->URCommon|my|contribute|mode=requirement"; $lang->my->contributeMenu->story = "$lang->SRCommon|my|contribute|mode=story"; $lang->my->contributeMenu->bug = 'Bug|my|contribute|mode=bug'; $lang->my->contributeMenu->testcase = 'Test Case|my|contribute|mode=testtask&type=openedbyme'; diff --git a/module/common/model.php b/module/common/model.php index 715cc27603..b83bb4581b 100644 --- a/module/common/model.php +++ b/module/common/model.php @@ -539,7 +539,7 @@ class commonModel extends model if(!$openApp) return; $icon = zget($lang->navIcons, $openApp, ''); - + if(!in_array($openApp, array('program', 'product', 'project'))) { $nav = $lang->mainNav->$openApp; @@ -1300,13 +1300,16 @@ EOD; global $lang, $app; if(isonlybody()) return false; + $moduleName = ($app->getModuleName() == 'story' and $app->openApp == 'project') ? 'projectstory' : $app->getModuleName(); echo "'; diff --git a/module/dept/view/edit.html.php b/module/dept/view/edit.html.php index 1213d49328..aef6145c96 100644 --- a/module/dept/view/edit.html.php +++ b/module/dept/view/edit.html.php @@ -47,4 +47,13 @@ if(isset($pageCSS)) css::internal($pageCSS); diff --git a/module/index/control.php b/module/index/control.php index 9d8983d7c1..8d9fbd1d5f 100644 --- a/module/index/control.php +++ b/module/index/control.php @@ -80,7 +80,9 @@ class index extends control { $objectType = $this->post->objectType; $appGroup = zget($this->config->index->appGroup, $objectType, ''); - if($objectType == 'testcase') $objectType = 'case'; + if($objectType == 'testcase') $objectType = 'case'; + if($objectType == 'testreport') $objectType = 'report'; + if($objectType == 'productplan') $objectType = 'productPlan'; $this->session->set($objectType . 'List', '', $appGroup); } diff --git a/module/project/control.php b/module/project/control.php index 9b534df024..c3c3c6524c 100644 --- a/module/project/control.php +++ b/module/project/control.php @@ -490,8 +490,6 @@ class project extends control $this->project->setMenu($projectID); - $this->app->session->set('projectList', $this->app->getURI(true), 'project'); - $products = $this->loadModel('product')->getProducts($projectID); $linkedBranches = array(); foreach($products as $product) diff --git a/module/project/model.php b/module/project/model.php index 17acade02d..5027a67617 100644 --- a/module/project/model.php +++ b/module/project/model.php @@ -1608,19 +1608,19 @@ class projectModel extends model $projectSubMenu = $this->lang->project->menu->{$key}['dropMenu']; $dropMenu = common::createDropMenu($this->lang->project->menu->{$key}['dropMenu'], $objectID); if(!empty($dropMenu)) - { + { foreach($dropMenu as $menuKey => $menu) - { - $itemMenu = zget($projectSubMenu, $menuKey, ''); + { + $itemMenu = zget($projectSubMenu, $menuKey, ''); $isActive['method'] = ($moduleName == strtolower($menu->link['module']) and $methodName == strtolower($menu->link['method'])); $isActive['alias'] = ($moduleName == strtolower($menu->link['module']) and (is_array($itemMenu) and isset($itemMenu['alias']) and strpos($itemMenu['alias'], $methodName) !== false)); $isActive['subModule'] = (is_array($itemMenu) and isset($itemMenu['subModule']) and strpos($itemMenu['subModule'], $moduleName) !== false); if($isActive['method'] or $isActive['alias'] or $isActive['subModule']) - { + { $this->lang->project->menu->{$key}['link'] = $menu->text . "|" . join('|', $menu->link); break; - } - } + } + } $this->lang->project->menu->{$key}['dropMenu'] = $dropMenu; } } diff --git a/module/search/control.php b/module/search/control.php index ab2fb8ed64..9f10bff29b 100644 --- a/module/search/control.php +++ b/module/search/control.php @@ -216,6 +216,7 @@ class search extends control $this->session->set('testsuiteList', $uri, 'qa'); $this->session->set('issueList', $uri, 'project'); $this->session->set('riskList', $uri, 'project'); + $this->session->set('caselibList', $uri, 'qa'); $this->session->set('searchIngWord', $words); $this->session->set('searchIngType', $type); diff --git a/module/testtask/view/results.html.php b/module/testtask/view/results.html.php index e9cecc3647..9152ac8596 100644 --- a/module/testtask/view/results.html.php +++ b/module/testtask/view/results.html.php @@ -53,7 +53,8 @@ id,executionID=$testtask->execution,buildID=$testtask->build" : '';?>