diff options
| author | Marc Alexander <admin@m-a-styles.de> | 2016-02-05 23:48:57 +0100 |
|---|---|---|
| committer | Marc Alexander <admin@m-a-styles.de> | 2016-02-16 18:21:04 +0100 |
| commit | 49736322887029b409ff177eafca9581c6622e83 (patch) | |
| tree | 560e4059e2ab4ada7d2bd2f33bdcf425ece2862b | |
| parent | d0ce6a18df2172a6e9baf1f1c2802efb30b25323 (diff) | |
| download | forums-49736322887029b409ff177eafca9581c6622e83.tar forums-49736322887029b409ff177eafca9581c6622e83.tar.gz forums-49736322887029b409ff177eafca9581c6622e83.tar.bz2 forums-49736322887029b409ff177eafca9581c6622e83.tar.xz forums-49736322887029b409ff177eafca9581c6622e83.zip | |
[ticket/14315] Only add role options specified for each group
PHPBB3-14315
| -rw-r--r-- | phpBB/adm/style/permission_mask.html | 2 | ||||
| -rw-r--r-- | phpBB/includes/acp/auth.php | 1 |
2 files changed, 3 insertions, 0 deletions
diff --git a/phpBB/adm/style/permission_mask.html b/phpBB/adm/style/permission_mask.html index 347da3181e..75e76b157d 100644 --- a/phpBB/adm/style/permission_mask.html +++ b/phpBB/adm/style/permission_mask.html @@ -46,7 +46,9 @@ <div class="dropdown hidden"> <ul class="dropdown-contents" id="role{p_mask.S_ROW_COUNT}{p_mask.f_mask.S_ROW_COUNT}" > {% for role in loops.role_options %} + {% if role.UG_ID == p_mask.f_mask.UG_ID %} <li data-id="{{ role.ID }}" data-target-id="advanced{p_mask.S_ROW_COUNT}{p_mask.f_mask.S_ROW_COUNT}" data-title="{{ role.TITLE }}"{% if role.SELECTED == true %} data-selected="{{ role.SELECTED }}"{% endif %}>{{ role.ROLE_NAME }}</li> + {% endif %} {% endfor %} </ul> </div> diff --git a/phpBB/includes/acp/auth.php b/phpBB/includes/acp/auth.php index 11478842d7..a3972158a2 100644 --- a/phpBB/includes/acp/auth.php +++ b/phpBB/includes/acp/auth.php @@ -477,6 +477,7 @@ class auth_admin extends \phpbb\auth\auth $template->assign_block_vars('role_options', array( 'ID' => $role_id, + 'UG_ID' => $ug_id, 'ROLE_NAME' => $role_name, 'TITLE' => $role_description, 'SELECTED' => $role_id == $current_role_id, |