diff --git a/module/group/control.php b/module/group/control.php index d1319d8c5a..8f2285bed2 100644 --- a/module/group/control.php +++ b/module/group/control.php @@ -446,7 +446,7 @@ class group extends control $this->view->privList = $privList; $this->view->packages = $this->group->getPrivPackagesByView($view); $this->view->moduleLang = $moduleLang; - $this->view->modulePackages = $this->group->getModuleAndPackageTree(); + $this->view->modulePackages = $this->group->getModuleAndPackageTree('package'); $this->display(); } @@ -660,7 +660,7 @@ class group extends control $privID = intval($privID); $currentLang = $this->app->clientLang ? : 'zh-cn'; $priv = $this->group->getPrivInfo($privID, $currentLang); - + if(!$priv) { return print(js::alert($this->lang->group->noneProject)); @@ -674,7 +674,7 @@ class group extends control $this->group->updatePrivLang($privID, $currentLang); $actionID = $this->loadModel('action')->create('privlang', $privID, 'Edited'); - + if(dao::isError()) { $responseResult = "fail"; diff --git a/module/group/model.php b/module/group/model.php index 720c6adb21..a6327f77ff 100644 --- a/module/group/model.php +++ b/module/group/model.php @@ -1321,32 +1321,33 @@ class groupModel extends model ->fetch(); if($privInfo) $privInfo->module = $privInfo->package ? $privInfo->module . ',' . $privInfo->package : $privInfo->module; - + return $privInfo; } /** - * get priv package tree + * Get priv package tree. * + * @param string $type * @return array **/ - public function getModuleAndPackageTree() + public function getModuleAndPackageTree($type = 'all') { $modules = $this->getMenuModules(null, true); - + $tree = []; foreach($modules as $module => $moduleName) { - $tree[$module] = $moduleName; - $packages = $this->getPrivPackagesByModule($module); + if($type == 'all') $tree[$module] = $moduleName; + $packages = $this->getPrivPackagesByModule($module); foreach($packages as $packageID => $package) { $tree[$module . ',' . $packageID] = $moduleName . '/' . $package->name; } } - return $tree; + return $tree; } /** * update priv info @@ -1359,9 +1360,9 @@ class groupModel extends model $data = fixer::input('post')->remove('module')->get(); $this->dao->update(TABLE_PRIVLANG)->data($data)->where('priv')->eq($privID)->andWhere('lang')->eq($lang)->exec(); - $data = fixer::input('post')->remove('name, desc')->get(); + $data = fixer::input('post')->remove('name, desc')->get(); if($data->module) - { + { $update = []; $module = explode(",", $data->module); $update['module'] = $module[0];