diff --git a/modules/communication/tpl/index.html b/modules/communication/tpl/index.html index 4f3909820..9fc84762e 100644 --- a/modules/communication/tpl/index.html +++ b/modules/communication/tpl/index.html @@ -104,12 +104,9 @@
- @@ -2210,21 +2209,6 @@ jQuery(function($){ var htInfo, sDefault, $node, $groupNode, aGroup, sGrant; for(var i=0, nLen=aPerms.length; i - - -
-
- - */ sDefault = htInfo.sDefault; //aGroup = htInfo.aGroup; diff --git a/modules/module/module.model.php b/modules/module/module.model.php index 9e95e87e6..dee7980c0 100644 --- a/modules/module/module.model.php +++ b/modules/module/module.model.php @@ -2125,23 +2125,10 @@ class moduleModel extends module // Log-in member only if($member_info->member_srl) { - if($val->group_srl == -1) + if($val->group_srl == -1 || $val->group_srl == -2) { $grant->{$val->name} = true; } - // Site-joined member only - else if($val->group_srl == -2) - { - // Grant if no information of the currently connected site exists - if(!Context::get('site_module_info')->site_srl) - { - $grant->{$val->name} = true; - } - else if(count($member_group)) - { - $grant->{$val->name} = true; - } - } // Manager only else if($val->group_srl == -3) { diff --git a/modules/module/tpl/include.module_grant_setup.html b/modules/module/tpl/include.module_grant_setup.html index f793a635b..67cc4048d 100644 --- a/modules/module/tpl/include.module_grant_setup.html +++ b/modules/module/tpl/include.module_grant_setup.html @@ -9,14 +9,12 @@

{$lang->permission_setting}

-

{$lang->about_grant_deatil}

diff --git a/modules/module/tpl/module_grant_setup.html b/modules/module/tpl/module_grant_setup.html index 5d297807c..89db445e4 100644 --- a/modules/module/tpl/module_grant_setup.html +++ b/modules/module/tpl/module_grant_setup.html @@ -20,11 +20,9 @@ -

{$lang->about_grant_deatil}