* adjust for menu.

This commit is contained in:
wangyidong
2021-04-08 17:12:50 +08:00
parent 52511f5e7a
commit 85bc4283cb
4 changed files with 8 additions and 39 deletions
+1 -2
View File
@@ -520,8 +520,7 @@ $lang->navGroup->ci = 'devops';
$lang->navGroup->svn = 'devops';
$lang->navGroup->git = 'devops';
$lang->navGroup->company = 'system';
$lang->navGroup->ldap = 'system';
$lang->navGroup->company = 'system';
$lang->navGroup->attend = 'attend';
$lang->navGroup->leave = 'attend';
-1
View File
@@ -336,7 +336,6 @@ class custom extends control
unset($this->lang->admin->menu->custom['subModule']);
$this->lang->admin->menu->system['subModule'] = 'custom';
$this->lang->custom->menu = $this->lang->admin->menu;
$this->view->title = $this->lang->custom->timezone;
$this->view->position[] = $this->lang->custom->timezone;
+7 -3
View File
@@ -11,9 +11,6 @@
*/
?>
<?php include '../../common/view/header.html.php';?>
<div id='mainMenu' class='clearfix'>
<div class='btn-toolbar pull-left'><?php // common::printAdminSubMenu('system');?></div>
</div>
<div id='mainContent' class='main-content'>
<div class='mw-500px'>
<?php if(!function_exists('date_default_timezone_set')):?>
@@ -35,4 +32,11 @@
<?php endif;?>
</div>
</div>
<script>
$(function()
{
$('#mainHeader #navbar li[data-id=model]').removeClass('active');
})
</script>
<?php include '../../common/view/footer.html.php';?>
-33
View File
@@ -11,39 +11,6 @@
*/
class testreportModel extends model
{
/**
* Set menu.
*
* @param array $products
* @param int $productID
* @param int $branch
* @access public
* @return void
*/
public function setMenu($products, $productID, $branch = 0)
{
$this->loadModel('product')->setMenu($products, $productID, $branch);
foreach($this->lang->testtask->menu as $key => $value)
{
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);
}
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);
}
}
/**
* Create report.
*