aboutsummaryrefslogtreecommitdiff
path: root/phpBB/adm
diff options
context:
space:
mode:
authorMarc Alexander <admin@m-a-styles.de>2019-09-20 22:23:18 +0200
committerMarc Alexander <admin@m-a-styles.de>2019-09-20 22:23:18 +0200
commit17fe7baa381e92cb8a5855b2ee160dec0da5d542 (patch)
treef66b585bc0099f8386bc8faad75748907c65022e /phpBB/adm
parentMerge pull request #5660 from marc1706/ticket/16133 (diff)
parentMerge branch '3.2.x' into 3.3.x (diff)
downloadphpbb-17fe7baa381e92cb8a5855b2ee160dec0da5d542.tar.gz
phpbb-17fe7baa381e92cb8a5855b2ee160dec0da5d542.tar.bz2
phpbb-17fe7baa381e92cb8a5855b2ee160dec0da5d542.zip
Merge branch '3.3.x'
Diffstat (limited to 'phpBB/adm')
-rw-r--r--phpBB/adm/style/permission_mask.html2
-rw-r--r--phpBB/adm/style/permissions.js4
2 files changed, 6 insertions, 0 deletions
diff --git a/phpBB/adm/style/permission_mask.html b/phpBB/adm/style/permission_mask.html
index c556664b8c..23294d60df 100644
--- a/phpBB/adm/style/permission_mask.html
+++ b/phpBB/adm/style/permission_mask.html
@@ -9,6 +9,8 @@
var role_options = new Array();
+ var no_role_assigned = "{LA_NO_ROLE_ASSIGNED}";
+
<!-- IF S_ROLE_JS_ARRAY -->
{S_ROLE_JS_ARRAY}
<!-- ENDIF -->
diff --git a/phpBB/adm/style/permissions.js b/phpBB/adm/style/permissions.js
index 9178adab50..af8e21ad51 100644
--- a/phpBB/adm/style/permissions.js
+++ b/phpBB/adm/style/permissions.js
@@ -279,6 +279,10 @@ function reset_role(id) {
}
t.options[0].selected = true;
+
+ var parent = t.parentNode;
+ parent.querySelector('span.dropdown-trigger').innerText = no_role_assigned;
+ parent.querySelector('input[data-name^=role]').value = '0';
}
/**