* Finish task #3187.

This commit is contained in:
pengjiangxiu
2017-08-21 16:04:00 +08:00
parent fa707a1464
commit 624950cfc9
2 changed files with 9 additions and 8 deletions
+7 -6
View File
@@ -375,16 +375,17 @@ class groupModel extends model
}
/**
* Check menu have module
*
* @param string $menu
* @param string $moduleName
* Check menu have module
*
* @param string $menu
* @param string $moduleName
* @access public
* @return void
*/
public function checkMenuModule($menu, $moduleName)
{
if(empty($menu)) return true;
if($menu == 'caselib' and $moduleName == 'testsuite') return true;
if($menu == 'other' and (isset($this->lang->menugroup->$moduleName) or isset($this->lang->menu->$moduleName))) return false;
if($menu != 'other' and !($moduleName == $menu or (isset($this->lang->menugroup->$moduleName) and $this->lang->menugroup->$moduleName == $menu))) return false;
return true;
@@ -392,8 +393,8 @@ class groupModel extends model
/**
* Get modules in menu
*
* @param string $menu
*
* @param string $menu
* @access public
* @return void
*/
+2 -2
View File
@@ -60,7 +60,7 @@
}
?>
<tr class='<?php echo cycle('even, bg-gray');?>'>
<th class='text-right w-150px'><?php echo $this->lang->$moduleName->common;?><?php echo html::selectAll($moduleName, 'checkbox')?></th>
<th class='text-right w-150px'><?php echo $lang->$moduleName->common;?><?php echo html::selectAll($moduleName, 'checkbox')?></th>
<td id='<?php echo $moduleName;?>' class='pv-10px'>
<?php $i = 1;?>
<?php if($moduleName == 'caselib') $moduleName = 'testsuite';?>
@@ -77,7 +77,7 @@
<tr>
<th class='text-right'><?php echo $lang->selectAll . html::selectAll('', 'checkbox')?></th>
<td>
<?php
<?php
echo html::submitButton($lang->save, "onclick='setNoChecked()'");
echo html::linkButton($lang->goback, $this->createLink('group', 'browse'));
echo html::hidden('foo'); // Just a hidden var, to make sure $_POST is not empty.