Design/EasySoft-ZenTaoPMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 30 Wiki Activity

* Adjust menu.

Browse Source
This commit is contained in:
leiyong
2021-03-11 14:50:38 +08:00
parent c18f43b922
commit 2316458960
19 changed files with 142 additions and 95 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
module/bug/control.php
View File

@@ -56,7 +56,7 @@ class bug extends control
}
$this->view->products = $this->products = $this->product->getProductPairsByProject($this->projectID);
if($this->projectID and empty($this->products)) die($this->locate($this->createLink('product', 'showErrorNone', "fromModule=bug")));
if(empty($this->products)) die($this->locate($this->createLink('product', 'showErrorNone', 'fromModule=bug&moduleGroup=' . $this->lang->navGroup->bug . '&activeMenu=bug')));
}
/**

2
module/bug/model.php
View File

@@ -44,7 +44,7 @@ class bugModel extends model
$this->lang->TRActions = $pageActions;
foreach($this->lang->bug->menu as $key => $menu)
{
$this->loadModel('qa')->setSubMenu('bug', $key, $productID);
if($this->lang->navGroup->testcase != 'qa') $this->loadModel('qa')->setSubMenu('bug', $key, $productID);
$replace = $productID;
if($this->lang->navGroup->testcase == 'project' and $key == 'bug') $replace = 0;
common::setMenuVars($this->lang->bug->menu, $key, $replace);

1
module/caselib/control.php
View File

@@ -37,7 +37,6 @@ class caselib extends control
{
$this->app->loadConfig('qa');
foreach($this->config->qa->menuList as $module) $this->lang->navGroup->$module = 'qa';
$this->lang->noMenuModule[] = $this->app->rawModule;
}
}

7
module/caselib/model.php
View File

@@ -101,7 +101,7 @@ class caselibModel extends model
$this->lang->TRActions = $pageActions;
foreach($this->lang->caselib->menu as $key => $value)
{
if($this->config->global->flow == 'full') $this->loadModel('qa')->setSubMenu('caselib', $key, $libID);
if($this->config->global->flow == 'full' and $this->lang->navGroup->testcase != 'qa') $this->loadModel('qa')->setSubMenu('caselib', $key, $libID);
$replace = $libID;
common::setMenuVars($this->lang->caselib->menu, $key, $replace);
}
@@ -109,7 +109,12 @@ class caselibModel extends model
if($this->config->global->flow != 'full' && $this->app->getMethodName() != 'view') $this->lang->caselib->menu->bysearch = "<a class='querybox-toggle' id='bysearchTab'><i class='icon icon-search muted'> </i>{$this->lang->testcase->bySearch}</a>";
if($this->lang->navGroup->caselib == 'qa')
{
foreach($this->lang->qa->subMenu->testcase as $key => $menu)
{
common::setMenuVars($this->lang->qa->subMenu->testcase, $key, $libID);
}
$this->lang->qa->menu = $this->lang->caselib->menu;
$this->lang->caselib->menu = $this->lang->qa->subMenu->testcase;
$this->lang->qa->mainMenuAction = html::a(helper::createLink('caselib', 'create'), "<i class='icon-plus'></i>" . $this->lang->caselib->create, '', "class='btn btn-link'");
if(!empty($libraries))

67
module/common/lang/zh-cn.php
View File

@@ -378,15 +378,26 @@ $lang->qa->menu = new stdclass();
$lang->qa->menu->index = array('link' => '仪表盘|qa|index');
$lang->qa->menu->bug = array('link' => 'Bug|bug|browse|productID=%s', 'alias' => 'view,create,batchcreate,edit,resolve,close,activate,report,batchedit,batchactivate,confirmbug,assignto');
$lang->qa->menu->testcase = array('link' => '用例|testcase|browse|productID=%s', 'alias' => 'view,create,batchcreate,edit,batchedit,showimport,groupcase,importfromlib', 'class' => 'dropdown dropdown-hover');
$lang->qa->menu->testtask = array('link' => '测试单|testtask|browse|productID=%s', 'alias' => 'view,create,edit,linkcase,cases,start,close,batchrun,groupcase,report,importunitresult');
$lang->qa->menu->testsuite = array('link' => '套件|testsuite|browse|productID=%s', 'alias' => 'view,create,edit,linkcase');
$lang->qa->menu->report = array('link' => '报告|testreport|browse|productID=%s', 'alias' => 'view,create,edit');
$lang->qa->menu->caselib = array('link' => '用例库|caselib|browse', 'alias' => 'create,createcase,view,edit,batchcreatecase,showimport');
$lang->qa->menu->testtask = array('link' => '测试单|testtask|browse|productID=%s', 'alias' => 'view,create,edit,linkcase,cases,start,close,batchrun,groupcase,report,importunitresult', 'class' => 'dropdown dropdown-hover');
$lang->qa->menu->automation = array('link' => '自动化|automation|browse|productID=%s', 'alias' => '', 'class' => 'dropdown dropdown-hover');
$lang->qa->subMenu = new stdclass();
$lang->qa->subMenu->testcase = new stdclass();
$lang->qa->subMenu->testcase->feature = array('link' => '功能测试|testcase|browse|productID=%s', 'alias' => 'view,create,batchcreate,edit,batchedit,showimport,groupcase,importfromlib', 'subModule' => 'tree,story');
$lang->qa->subMenu->testcase->unit = array('link' => '单元测试|testtask|browseUnits|productID=%s', 'alias' => 'browseunits');
$lang->qa->subMenu->testcase->testsuite = array('link' => '套件|testsuite|browse|productID=%s', 'alias' => 'view,create,edit,linkcase');
$lang->qa->subMenu->testcase->caselib = array('link' => '用例库|caselib|browse|libID=0');
$lang->qa->subMenu->testtask = new stdclass();
$lang->qa->subMenu->testtask->testtask = array('link' => '测试单|testtask|browse|productID=%s', 'alias' => 'view,create,edit,linkcase,cases,start,close,batchrun,groupcase,report,importunitresult');
$lang->qa->subMenu->testtask->report = array('link' => '报告|testreport|browse|productID=%s', 'alias' => 'view,create,edit');
$lang->qa->subMenu->automation = new stdclass();
$lang->qa->subMenu->automation->browse = array('link' => '介绍|automation|browse|productID=%s', 'alias' => '');
$lang->qa->subMenu->automation->framework = array('link' => '框架|automation|framework|productID=%s', 'alias' => '');
$lang->qa->subMenu->automation->data = array('link' => '数据|automation|date|productID=%s', 'alias' => '');
$lang->qa->subMenu->automation->interface = array('link' => '接口|automation|interface|productID=%s', 'alias' => '');
$lang->qa->subMenu->automation->environment = array('link' => '环境|automation|environment|productID=%s', 'alias' => '');
$lang->bug = new stdclass();
$lang->bug->menu = new stdclass();
@@ -395,10 +406,8 @@ $lang->bug->subMenu = $lang->qa->subMenu;
$lang->bug->menu->index = array('link' => '仪表盘|qa|index');
$lang->bug->menu->bug = array('link' => 'Bug|bug|browse|productID=%s', 'alias' => 'view,create,batchcreate,edit,resolve,close,activate,report,batchedit,batchactivate,confirmbug,assignto', 'subModule' => 'tree');
$lang->bug->menu->testcase = array('link' => '用例|testcase|browse|productID=%s', 'class' => 'dropdown dropdown-hover');
$lang->bug->menu->testtask = array('link' => '测试单|testtask|browse|productID=%s');
$lang->bug->menu->testsuite = array('link' => '套件|testsuite|browse|productID=%s');
$lang->bug->menu->report = array('link' => '报告|testreport|browse|productID=%s');
$lang->bug->menu->caselib = array('link' => '用例库|caselib|browse');
$lang->bug->menu->testtask = array('link' => '测试单|testtask|browse|productID=%s', 'class' => 'dropdown dropdown-hover');
$lang->bug->menu->automation = array('link' => '自动化|automation|browse|productID=%s', 'alias' => '', 'class' => 'dropdown dropdown-hover');
$lang->testcase = new stdclass();
$lang->testcase->menu = new stdclass();
@@ -406,10 +415,8 @@ $lang->testcase->subMenu = $lang->qa->subMenu;
$lang->testcase->menu->index = array('link' => '仪表盘|qa|index');
$lang->testcase->menu->bug = array('link' => 'Bug|bug|browse|productID=%s');
$lang->testcase->menu->testcase = array('link' => '用例|testcase|browse|productID=%s', 'alias' => 'view,create,batchcreate,edit,batchedit,showimport,groupcase,importfromlib', 'subModule' => 'tree,story', 'class' => 'dropdown dropdown-hover');
$lang->testcase->menu->testtask = array('link' => '测试单|testtask|browse|productID=%s');
$lang->testcase->menu->testsuite = array('link' => '套件|testsuite|browse|productID=%s');
$lang->testcase->menu->report = array('link' => '报告|testreport|browse|productID=%s');
$lang->testcase->menu->caselib = array('link' => '用例库|caselib|browse');
$lang->testcase->menu->testtask = array('link' => '测试单|testtask|browse|productID=%s', 'class' => 'dropdown dropdown-hover');
$lang->testcase->menu->automation = array('link' => '自动化|automation|browse|productID=%s', 'alias' => '', 'class' => 'dropdown dropdown-hover');
$lang->testtask = new stdclass();
$lang->testtask->menu = new stdclass();
@@ -417,21 +424,17 @@ $lang->testtask->subMenu = $lang->qa->subMenu;
$lang->testtask->menu->index = array('link' => '仪表盘|qa|index');
$lang->testtask->menu->bug = array('link' => 'Bug|bug|browse|productID=%s');
$lang->testtask->menu->testcase = array('link' => '用例|testcase|browse|productID=%s', 'class' => 'dropdown dropdown-hover');
$lang->testtask->menu->testtask = array('link' => '测试单|testtask|browse|productID=%s', 'subModule' => 'testtask', 'alias' => 'view,create,edit,linkcase,cases,start,close,batchrun,groupcase,report');
$lang->testtask->menu->testsuite = array('link' => '套件|testsuite|browse|productID=%s');
$lang->testtask->menu->report = array('link' => '报告|testreport|browse|productID=%s');
$lang->testtask->menu->caselib = array('link' => '用例库|caselib|browse');
$lang->testtask->menu->testtask = array('link' => '测试单|testtask|browse|productID=%s', 'class' => 'dropdown dropdown-hover');
$lang->testtask->menu->automation = array('link' => '自动化|automation|browse|productID=%s', 'alias' => '', 'class' => 'dropdown dropdown-hover');
$lang->testsuite = new stdclass();
$lang->testsuite->menu = new stdclass();
$lang->testsuite->subMenu = $lang->qa->subMenu;
$lang->testsuite->menu->index = array('link' => '仪表盘|qa|index');
$lang->testsuite->menu->bug = array('link' => 'Bug|bug|browse|productID=%s');
$lang->testsuite->menu->testcase = array('link' => '用例|testcase|browse|productID=%s', 'class' => 'dropdown dropdown-hover');
$lang->testsuite->menu->testtask = array('link' => '测试单|testtask|browse|productID=%s');
$lang->testsuite->menu->testsuite = array('link' => '套件|testsuite|browse|productID=%s', 'alias' => 'view,create,edit,linkcase');
$lang->testsuite->menu->report = array('link' => '报告|testreport|browse|productID=%s');
$lang->testsuite->menu->caselib = array('link' => '用例库|caselib|browse');
$lang->testsuite->menu->testcase = array('link' => '用例|testcase|browse|productID=%s', 'subModule' => 'testsuite', 'class' => 'dropdown dropdown-hover');
$lang->testsuite->menu->testtask = array('link' => '测试单|testtask|browse|productID=%s', 'class' => 'dropdown dropdown-hover');
$lang->testsuite->menu->automation = array('link' => '自动化|automation|browse|productID=%s', 'alias' => '', 'class' => 'dropdown dropdown-hover');
$lang->testreport = new stdclass();
$lang->testreport->menu = new stdclass();
@@ -439,25 +442,17 @@ $lang->testreport->subMenu = $lang->qa->subMenu;
$lang->testreport->menu->index = array('link' => '仪表盘|qa|index');
$lang->testreport->menu->bug = array('link' => 'Bug|bug|browse|productID=%s');
$lang->testreport->menu->testcase = array('link' => '用例|testcase|browse|productID=%s', 'class' => 'dropdown dropdown-hover');
$lang->testreport->menu->testtask = array('link' => '测试单|testtask|browse|productID=%s');
$lang->testreport->menu->testsuite = array('link' => '套件|testsuite|browse|productID=%s');
$lang->testreport->menu->report = array('link' => '报告|testreport|browse|productID=%s', 'alias' => 'view,create,edit');
$lang->testreport->menu->caselib = array('link' => '用例库|caselib|browse');
$lang->testreport->menu->testtask = array('link' => '测试单|testtask|browse|productID=%s', 'subModule' => 'testreport', 'class' => 'dropdown dropdown-hover');
$lang->testreport->menu->automation = array('link' => '自动化|automation|browse|productID=%s', 'alias' => '', 'class' => 'dropdown dropdown-hover');
$lang->caselib = new stdclass();
$lang->caselib->menu = new stdclass();
$lang->caselib->subMenu = $lang->qa->subMenu;
$lang->caselib->menu->index = array('link' => '仪表盘|qa|index');
$lang->caselib->menu->bug = array('link' => 'Bug|bug|browse|');
$lang->caselib->menu->testcase = array('link' => '用例|testcase|browse|', 'class' => 'dropdown dropdown-hover');
$lang->caselib->menu->testtask = array('link' => '测试单|testtask|browse|');
$lang->caselib->menu->testsuite = array('link' => '套件|testsuite|browse|');
$lang->caselib->menu->report = array('link' => '报告|testreport|browse|');
$lang->caselib->menu->caselib = array('link' => '用例库|caselib|browse|libID=%s', 'alias' => 'create,createcase,view,edit,batchcreatecase,showimport', 'subModule' => 'tree,testcase');
$lang->caselib->subMenu = new stdclass();
$lang->caselib->subMenu->testcase = new stdclass();
$lang->caselib->subMenu->testcase->feature = array('link' => '功能测试|testcase|browse|', 'alias' => 'view,create,batchcreate,edit,batchedit,showimport,groupcase,importfromlib', 'subModule' => 'tree,story');
$lang->caselib->subMenu->testcase->unit = array('link' => '单元测试|testtask|browseUnits|');
$lang->caselib->menu->bug = array('link' => 'Bug|bug|browse|productID=%s');
$lang->caselib->menu->testcase = array('link' => '用例|testcase|browse|productID=%s', 'subModule' => 'caselib', 'class' => 'dropdown dropdown-hover');
$lang->caselib->menu->testtask = array('link' => '测试单|testtask|browse|productID=%s', 'class' => 'dropdown dropdown-hover');
$lang->caselib->menu->automation = array('link' => '自动化|automation|browse|productID=%s', 'alias' => '', 'class' => 'dropdown dropdown-hover');
$lang->ci = new stdclass();
$lang->ci->menu = new stdclass();

3
module/index/js/index.js
View File

@@ -107,7 +107,8 @@
if(methodLowerCase === 'create' && (link.params.programID || link.params.$1)) return 'program';
if(methodLowerCase === 'edit' && (link.params.programID || link.params.$4)) return 'program';
if(methodLowerCase === 'batchedit') return 'program';
if(methodLowerCase === 'showerrornone' && (link.params.fromModule || link.params.$1) !== 'product') return 'project';
var moduleGroup = link.params.moduleGroup ? link.params.moduleGroup : link.params.$2;
if(methodLowerCase === 'showerrornone' && (moduleGroup || moduleGroup)) return moduleGroup;
}
if(moduleName === 'stakeholder')
{

43
module/product/control.php
View File

@@ -973,24 +973,49 @@ class product extends control
* @access public
* @return void
*/
public function showErrorNone($fromModule = 'bug')
public function showErrorNone($fromModule = 'bug', $moduleGroup = 'product', $activeMenu = '')
{
if($fromModule != 'product')
/* The module in the test menu shows the created product. */
if($moduleGroup == 'qa')
{
$this->lang->navGroup->product = 'project';
$this->loadModel('qa')->setMenu(array(), 0);
$this->app->loadLang($fromModule);
foreach($this->config->qa->menuList as $module) $this->lang->navGroup->$module = 'qa';
$this->lang->set('menugroup.product', $activeMenu);
$this->lang->product->menu = $this->lang->qa->menu;
$this->lang->product->menuOrder = $this->lang->qa->menuOrder;
}
/* The module in the project menu displays related products. */
if($moduleGroup == 'project')
{
$this->app->loadLang($fromModule);
$this->lang->set('menugroup.product', $activeMenu);
$projectModel = $this->loadModel('project')->getByID($this->session->PRJ);
$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')))
{
$this->lang->set('menugroup.product', 'qa');
$moduleIndex = array_search('product', $this->lang->noMenuModule);
if($moduleIndex !== false) unset($this->lang->noMenuModule[$moduleIndex]);
$this->view->project = $this->loadModel('project')->getById($this->session->PRJ);
$menu = $this->lang->qa->menu->$activeMenu;
$menu['subModule'] = 'product';
$this->lang->qa->menu->$activeMenu = $menu;
$this->app->rawModule = 'qa';
$this->loadModel('qa')->setMenu(array(), 0);
}
}
$this->loadModel($fromModule)->setMenu($this->products, key($this->products));
$this->lang->set('menugroup.product', 'qa');
$this->lang->product->menu = $this->lang->$fromModule->menu;
$this->lang->product->menuOrder = $this->lang->$fromModule->menuOrder;
$this->view->title = $this->lang->$fromModule->common;
$this->view->fromModule = $fromModule;
$this->view->moduleGroup = $moduleGroup;
$this->display();
}

4
module/product/view/showerrornone.html.php
View File

@@ -11,9 +11,9 @@
*/
?>
<?php include '../../common/view/header.html.php';?>
<?php if($fromModule != 'product' && !empty($project)):?>
<?php if($moduleGroup == 'project'):?>
<div class="table-empty-tip">
<p><span class="text-muted"><?php echo $lang->product->noProduct;?></span> <?php common::printLink('project', 'manageProducts', "projectID=$project->id&programID=$project->parent", "<i class='icon icon-plus'></i> " . $lang->project->manageProducts, '', "class='btn btn-info'");?></p>
<p><span class="text-muted"><?php echo $lang->product->noProduct;?></span> <?php common::printLink('project', 'manageProducts', "projectID={$this->session->PRJ}", "<i class='icon icon-plus'></i> " . $lang->project->manageProducts, '', "class='btn btn-info'");?></p>
</div>
<script>$("#menuNav .nav li a[href*='product']").closest('li').removeClass('active');</script>
<?php else:?>

2
module/projectstory/control.php
View File

@@ -24,7 +24,7 @@ class projectStory extends control
{
parent::__construct($moduleName, $methodName);
$this->products = $this->loadModel('product')->getProductPairsByProject($this->session->PRJ);
if(empty($this->products)) die($this->locate($this->createLink('product', 'showErrorNone', "fromModule=projectstory")));
if(empty($this->products)) die($this->locate($this->createLink('product', 'showErrorNone', 'fromModule=projectstory&moduleGroup=' . $this->lang->navGroup->projectstory . '&activeMenu=projectstory')));
}
/**

4
module/qa/control.php
View File

@@ -29,7 +29,7 @@ class qa extends control
{
parent::__construct();
/* Set report menu group. */
/* Set qa menu group. */
$this->projectID = isset($_GET['PRJ']) ? $_GET['PRJ'] : 0;
if(!$this->projectID)
{
@@ -47,7 +47,7 @@ class qa extends control
public function index($locate = 'auto', $productID = 0)
{
$this->products = $this->loadModel('product')->getProductPairsByProject($this->projectID, 'noclosed');
if(empty($this->products)) die($this->locate($this->createLink('product', 'showErrorNone', "fromModule=qa")));
if(empty($this->products)) die($this->locate($this->createLink('product', 'showErrorNone', 'fromModule=qa&moduleGroup=' . $this->lang->navGroup->qa . '&activeMenu=index')));
if($locate == 'yes') $this->locate($this->createLink('bug', 'browse'));
$productID = $this->product->saveState($productID, $this->products);

2
module/qa/model.php
View File

@@ -42,7 +42,7 @@ class qaModel extends model
$this->lang->modulePageNav = $productIndex;
foreach($this->lang->qa->menu as $key => $menu)
{
if($this->config->global->flow == 'full') $this->setSubMenu('qa', $key, $productID);
if($this->config->global->flow == 'full' && $this->lang->navGroup->qa != 'qa') $this->setSubMenu('qa', $key, $productID);
$replace = $productID;
if($this->lang->navGroup->testcase == 'project' and $key == 'bug') $replace = 0;
common::setMenuVars($this->lang->qa->menu, $key, $replace);

2
module/testcase/control.php
View File

@@ -46,7 +46,7 @@ class testcase extends control
{
$this->app->loadConfig('qa');
foreach($this->config->qa->menuList as $module) $this->lang->navGroup->$module = 'qa';
$this->lang->noMenuModule[] = $this->app->rawModule;
//$this->lang->noMenuModule[] = $this->app->rawModule;
}
$this->view->products = $this->products = $this->product->getProductPairsByProject($this->projectID);

11
module/testcase/model.php
View File

@@ -44,15 +44,18 @@ class testcaseModel extends model
$this->lang->TRActions = $pageActions;
foreach($this->lang->testcase->menu as $key => $menu)
{
$this->loadModel('qa')->setSubMenu('testcase', $key, $productID);
$replace = $productID;
if($this->lang->navGroup->testcase == 'project' and $key == 'bug') $replace = 0;
common::setMenuVars($this->lang->testcase->menu, $key, $replace);
if($this->lang->navGroup->testcase != 'qa') $this->loadModel('qa')->setSubMenu('testcase', $key, $productID);
common::setMenuVars($this->lang->testcase->menu, $key, $productID);
}
if($this->lang->navGroup->testcase == 'qa')
{
foreach($this->lang->qa->subMenu->testcase as $key => $menu)
{
common::setMenuVars($this->lang->qa->subMenu->testcase, $key, $productID);
}
$this->lang->qa->menu = $this->lang->testcase->menu;
$this->lang->testcase->menu = $this->lang->qa->subMenu->testcase;
$this->lang->qa->switcherMenu = $this->product->getSwitcher($productID, '', $branch);
}
}

3
module/testreport/control.php
View File

@@ -42,7 +42,6 @@ class testreport extends control
{
$this->app->loadConfig('qa');
foreach($this->config->qa->menuList as $module) $this->lang->navGroup->$module = 'qa';
$this->lang->noMenuModule[] = $this->app->rawModule;
}
}
@@ -537,7 +536,7 @@ class testreport extends control
{
$projectID = $this->lang->navGroup->testreport == 'qa' ? 0 : $this->session->PRJ;
$this->products = $this->product->getProductPairsByProject($projectID);
if(empty($this->products)) die($this->locate($this->createLink('product', 'showErrorNone', "fromModule=testreport")));
if(empty($this->products)) die($this->locate($this->createLink('product', 'showErrorNone', 'fromModule=testreport&moduleGroup=' . $this->lang->navGroup->bug . '&activeMenu=report')));
$productID = $this->product->saveState($objectID, $this->products);
$this->testreport->setMenu($this->products, $productID);
return $productID;

7
module/testreport/model.php
View File

@@ -35,7 +35,7 @@ class testreportModel extends model
$this->lang->TRActions = $pageActions;
foreach($this->lang->testtask->menu as $key => $value)
{
$this->loadModel('qa')->setSubMenu('testreport', $key, $productID);
if($this->lang->navGroup->testreport != 'qa') $this->loadModel('qa')->setSubMenu('testreport', $key, $productID);
$replace = $productID;
if($this->lang->navGroup->testcase == 'project' and $key == 'bug') $replace = 0;
common::setMenuVars($this->lang->testreport->menu, $key, $replace);
@@ -43,7 +43,12 @@ class testreportModel extends model
if($this->lang->navGroup->testreport == 'qa')
{
foreach($this->lang->qa->subMenu->testtask as $key => $menu)
{
common::setMenuVars($this->lang->qa->subMenu->testtask, $key, $productID);
}
$this->lang->qa->menu = $this->lang->testreport->menu;
$this->lang->testreport->menu = $this->lang->qa->subMenu->testtask;
$this->lang->qa->switcherMenu = $this->product->getSwitcher($productID, '', $branch);
}
}

3
module/testsuite/control.php
View File

@@ -37,7 +37,6 @@ class testsuite extends control
{
$this->app->loadConfig('qa');
foreach($this->config->qa->menuList as $module) $this->lang->navGroup->$module = 'qa';
$this->lang->noMenuModule[] = $this->app->rawModule;
}
}
@@ -71,7 +70,7 @@ class testsuite extends control
/* Set menu. */
$projectID = $this->lang->navGroup->testreport == 'qa' ? 0 : $this->session->PRJ;
$this->view->products = $this->products = $this->loadModel('product')->getProductPairsByProject($projectID);
if(empty($this->products)) die($this->locate($this->createLink('product', 'showErrorNone', "fromModule=testsuite")));
if(empty($this->products)) die($this->locate($this->createLink('product', 'showErrorNone', 'fromModule=testsuite&moduleGroup=' . $this->lang->navGroup->bug . '&activeMenu=testsuite')));
$productID = $this->product->saveState($productID, $this->products);
$this->testsuite->setMenu($this->products, $productID);

8
module/testsuite/model.php
View File

@@ -41,14 +41,20 @@ class testsuiteModel extends model
$this->lang->TRActions = $pageActions;
foreach($this->lang->testsuite->menu as $key => $value)
{
if($this->config->global->flow == 'full') $this->loadModel('qa')->setSubMenu('testsuite', $key, $productID);
if($this->config->global->flow == 'full' and $this->lang->navGroup->testcase != 'qa') $this->loadModel('qa')->setSubMenu('testsuite', $key, $productID);
$replace = $productID;
common::setMenuVars($this->lang->testsuite->menu, $key, $replace);
}
if($this->lang->navGroup->testsuite == 'qa')
{
foreach($this->lang->qa->subMenu->testcase as $key => $menu)
{
common::setMenuVars($this->lang->qa->subMenu->testcase, $key, $productID);
}
$this->lang->qa->menu = $this->lang->testsuite->menu;
$this->lang->testsuite->menu = $this->lang->qa->subMenu->testcase;
$this->lang->qa->switcherMenu = $this->product->getSwitcher($productID, '', 0);
}
}

4
module/testtask/control.php
View File

@@ -43,12 +43,12 @@ class testtask extends control
{
$this->app->loadConfig('qa');
foreach($this->config->qa->menuList as $module) $this->lang->navGroup->$module = 'qa';
$this->lang->noMenuModule[] = $this->app->rawModule;
//$this->lang->noMenuModule[] = $this->app->rawModule;
}
$this->loadModel('product');
$this->view->products = $this->products = $this->product->getProductPairsByProject($this->projectID);
if(empty($this->products)) die($this->locate($this->createLink('product', 'showErrorNone', "fromModule=testtask")));
if(empty($this->products)) die($this->locate($this->createLink('product', 'showErrorNone', 'fromModule=testtask&moduleGroup=' . $this->lang->navGroup->bug . '&activeMenu=testtask')));
}
/**

16
module/testtask/model.php
View File

@@ -62,7 +62,7 @@ class testtaskModel extends model
$this->lang->TRActions = $pageActions;
foreach($this->lang->testtask->menu as $key => $value)
{
$this->loadModel('qa')->setSubMenu('testtask', $key, $productID);
if($this->lang->navGroup->testtask != 'qa') $this->loadModel('qa')->setSubMenu('testtask', $key, $productID);
$replace = ($key == 'product') ? $selectHtml : $productID;
if($this->lang->navGroup->testcase == 'project' and $key == 'bug') $replace = 0;
common::setMenuVars($this->lang->testtask->menu, $key, $replace);
@@ -70,7 +70,12 @@ class testtaskModel extends model
if($this->lang->navGroup->testtask == 'qa')
{
foreach($this->lang->qa->subMenu->testtask as $key => $menu)
{
common::setMenuVars($this->lang->qa->subMenu->testtask, $key, $productID);
}
$this->lang->qa->menu = $this->lang->testtask->menu;
$this->lang->testtask->menu = $this->lang->qa->subMenu->testtask;
$this->lang->qa->switcherMenu = $this->product->getSwitcher($productID, '', $branch);
}
}
@@ -132,7 +137,7 @@ class testtaskModel extends model
if($this->config->global->flow != 'full') $this->lang->testtask->menu = new stdclass();
foreach($this->lang->testtask->menu as $key => $value)
{
$this->loadModel('qa')->setSubMenu('testtask', $key, $productID);
if($this->lang->navGroup->testcase != 'qa') $this->loadModel('qa')->setSubMenu('testtask', $key, $productID);
$replace = ($key == 'product') ? $selectHtml : $productID;
if($this->lang->navGroup->testcase == 'project' and $key == 'bug') $replace = 0;
common::setMenuVars($this->lang->testtask->menu, $key, $replace);
@@ -141,7 +146,12 @@ class testtaskModel extends model
$this->lang->testtask->menu->testcase['subModule'] = 'testtask';
if($this->lang->navGroup->testtask == 'qa')
{
$this->lang->qa->menu = $this->lang->testtask->menu;
foreach($this->lang->qa->subMenu->testcase as $key => $menu)
{
common::setMenuVars($this->lang->qa->subMenu->testcase, $key, $productID);
}
$this->lang->qa->menu = $this->lang->testcase->menu;
$this->lang->testtask->menu = $this->lang->qa->subMenu->testcase;
$this->lang->qa->switcherMenu = $this->product->getSwitcher($productID, '', $branch);
}
}