aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/adm/style
diff options
context:
space:
mode:
authorMarc Alexander <admin@m-a-styles.de>2016-02-06 09:33:33 +0100
committerMarc Alexander <admin@m-a-styles.de>2016-02-16 18:21:04 +0100
commit4cfba8f3a40c424d831b6034bdf1dc4975822406 (patch)
treed5145aedc8b4f3ef742b21335e46e30583c99748 /phpBB/adm/style
parenteab1b1ad11ae2e42cf4f6c3af9f7171d6dd0837b (diff)
downloadforums-4cfba8f3a40c424d831b6034bdf1dc4975822406.tar
forums-4cfba8f3a40c424d831b6034bdf1dc4975822406.tar.gz
forums-4cfba8f3a40c424d831b6034bdf1dc4975822406.tar.bz2
forums-4cfba8f3a40c424d831b6034bdf1dc4975822406.tar.xz
forums-4cfba8f3a40c424d831b6034bdf1dc4975822406.zip
[ticket/14315] Build role options for each permission group
Previously all role options were put into one array. This required filtering the options. Instead, these are now passed to the template via template loops. PHPBB3-14315
Diffstat (limited to 'phpBB/adm/style')
-rw-r--r--phpBB/adm/style/permission_mask.html6
1 files changed, 2 insertions, 4 deletions
diff --git a/phpBB/adm/style/permission_mask.html b/phpBB/adm/style/permission_mask.html
index aa18a40cb7..721fc42473 100644
--- a/phpBB/adm/style/permission_mask.html
+++ b/phpBB/adm/style/permission_mask.html
@@ -39,16 +39,14 @@
</div>
<dl class="permissions-simple">
<dt style="width: 20%"><label for="role{p_mask.S_ROW_COUNT}{p_mask.f_mask.S_ROW_COUNT}">{L_ROLE}{L_COLON}</label></dt>
- {% if role_options %}
+ {% if p_mask.f_mask.role_options %}
<dd style="margin-{S_CONTENT_FLOW_BEGIN}{L_COLON} 20%">
<div class="dropdown-container dropdown-button-control roles-options" data-alt-text="{LA_ROLE_DESCRIPTION}">
<span title="Roles" class="button icon-button tools-icon dropdown-trigger dropdown-select">{L_NO_ROLE_ASSIGNED}</span>
<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 %}
+ {% for role in p_mask.f_mask.role_options %}
<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>