* Fix menu.
This commit is contained in:
@@ -831,7 +831,7 @@ class commonModel extends model
|
||||
$class = isset($menuItem->class) ? $menuItem->class : '';
|
||||
$active = '';
|
||||
if($subModule and in_array($currentModule, $subModule)) $active = 'active';
|
||||
if($alias and $moduleName == $currentModule and strpos(",$alias,", ",$currentMethod,") !== false) $active = 'active';
|
||||
// if($alias and $moduleName == $currentModule and strpos(",$alias,", ",$currentMethod,") !== false) $active = 'active';
|
||||
if($menuItem->link)
|
||||
{
|
||||
$target = '';
|
||||
|
||||
@@ -987,10 +987,6 @@ class product extends control
|
||||
{
|
||||
$this->app->loadLang($fromModule);
|
||||
|
||||
$projectModel = $this->loadModel('project')->getByID($this->session->project);
|
||||
$this->lang->product->menu = $this->lang->menu->{$projectModel->model};
|
||||
$this->lang->product->menuOrder = $this->lang->{$projectModel->model}->menuOrder;
|
||||
|
||||
/* The secondary test menu processing in the project. */
|
||||
if(in_array($fromModule, array('qa', 'bug', 'testtask', 'testreport')))
|
||||
{
|
||||
|
||||
@@ -1463,8 +1463,6 @@ class story extends control
|
||||
foreach($this->config->qa->menuList as $module) $this->lang->navGroup->$module = 'qa';
|
||||
}
|
||||
|
||||
$this->lang->story->menu = $this->lang->qa->subMenu->testcase;
|
||||
$this->lang->story->menuOrder = $this->lang->testcase->menuOrder;
|
||||
$this->loadModel('testcase')->setMenu($products, $productID);
|
||||
|
||||
/* Append id for secend sort. */
|
||||
|
||||
Reference in New Issue
Block a user