fanbinit/rhymix
1
0
Fork 0
mirror of https://github.com/Lastorder-DC/rhymix.git synced 2026-05-22 05:15:29 +09:00
Code Issues Projects Releases Packages Wiki Activity

fix #2093 바로가기 메뉴의 권한을 수정하면 대상 모듈의 권한 설정이 제거되는 문제 고침

Browse source
This commit is contained in:
bnu 2017-05-25 17:29:23 +09:00 • committed by Kijin Sung
parent 71ca1385ac
commit 1c39d2b9cf
1 changed files with 30 additions and 18 deletions
Download patch file Download diff file Expand all files Collapse all files

48
modules/menu/menu.admin.controller.php
View file

@ -457,7 +457,6 @@ class menuAdminController extends menu
$args->parent_srl = $request->parent_srl; $args->parent_srl = $request->parent_srl;
$args->open_window = $request->menu_open_window; $args->open_window = $request->menu_open_window;
$args->expand = $request->menu_expand; $args->expand = $request->menu_expand;
$args->expand = $request->menu_expand;
$args->is_shortcut = $request->is_shortcut; $args->is_shortcut = $request->is_shortcut;
$args->url = $request->shortcut_target; $args->url = $request->shortcut_target;
@ -1696,9 +1695,21 @@ class menuAdminController extends menu
$oModuleModel = getModel('module'); $oModuleModel = getModel('module');
$moduleInfo = $oModuleModel->getModuleInfoByMid($itemInfo->url, $menuInfo->site_srl); $moduleInfo = $oModuleModel->getModuleInfoByMid($itemInfo->url, $menuInfo->site_srl);
$xml_info = $oModuleModel->getModuleActionXML($moduleInfo->module); $xml_info = $oModuleModel->getModuleActionXML($moduleInfo->module);
if($itemInfo->is_shortcut === 'Y')
{
$moduleGrnatsArgs = new stdClass;
$moduleGrnatsArgs->module_srl = $moduleInfo->module_srl;
$output = executeQueryArray('module.getModuleGrants', $moduleGrnatsArgs);
if(!$output->data) $output->data = array();
$moduleGrnats = new stdClass();
foreach($output->data as $grant)
{
$moduleGrnats->{$grant->name}[] = $grant->group_srl;
}
}
$grantList = $xml_info->grant; $grantList = $xml_info->grant;
if(!$grantList) $grantList = new stdClass; if(!$grantList) $grantList = new stdClass;
@ -1707,29 +1718,30 @@ class menuAdminController extends menu
$grantList->manager = new stdClass(); $grantList->manager = new stdClass();
$grantList->manager->default = 'manager'; $grantList->manager->default = 'manager';
$grant = new stdClass; $grant = new stdClass();
foreach($grantList AS $grantName=>$grantInfo) foreach($grantList AS $grantName=>$grantInfo)
{ {
if(!$htPerm[$grantName]) if($htPerm[$grantName])
{ {
continue; $htPerm[$grantName] = explode(',', $htPerm[$grantName]);
}
$htPerm[$grantName] = explode(',', $htPerm[$grantName]); // users in a particular group
if(is_array($htPerm[$grantName]))
// users in a particular group {
if(is_array($htPerm[$grantName])) $grant->{$grantName} = $htPerm[$grantName];
{ continue;
$grant->{$grantName} = $htPerm[$grantName]; }
continue; // -1 = Log-in user only, -2 = site members only, 0 = all users
else
{
$grant->{$grantName}[] = $htPerm[$grantName];
continue;
}
} }
// -1 = Log-in user only, -2 = site members only, 0 = all users else if($itemInfo->is_shortcut === 'Y')
else
{ {
$grant->{$grantName}[] = $htPerm[$grantName]; if(isset($moduleGrnats) && $moduleGrnats->{$grantName}) $grant->{$grantName} = $moduleGrnats->{$grantName};
continue;
} }
$grant->{$group_srls} = array();
} }
if(count($grant)) if(count($grant))