From 624950cfc9bc094d7038a8f0decd02546f7998ab Mon Sep 17 00:00:00 2001 From: pengjiangxiu Date: Mon, 21 Aug 2017 16:04:00 +0800 Subject: [PATCH] * Finish task #3187. --- module/group/model.php | 13 +++++++------ module/group/view/privbygroup.html.php | 4 ++-- 2 files changed, 9 insertions(+), 8 deletions(-) diff --git a/module/group/model.php b/module/group/model.php index fb9bea9cc4..6535165593 100644 --- a/module/group/model.php +++ b/module/group/model.php @@ -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 */ diff --git a/module/group/view/privbygroup.html.php b/module/group/view/privbygroup.html.php index b70ee3578d..fd1b618c26 100644 --- a/module/group/view/privbygroup.html.php +++ b/module/group/view/privbygroup.html.php @@ -60,7 +60,7 @@ } ?> '> - lang->$moduleName->common;?> + $moduleName->common;?> @@ -77,7 +77,7 @@ selectAll . html::selectAll('', 'checkbox')?> - 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.