Merge branch '3.2.x'

* 3.2.x:
  [ticket/14736] Reset role dropdown when modifying permissions
This commit is contained in:
Tristan Darricau 2016-12-03 13:03:18 +01:00
commit 4ae6cb9789
No known key found for this signature in database
GPG key ID: 817043C2E29DB881

View file

@ -211,6 +211,23 @@ $(function() {
// Prepare dropdown // Prepare dropdown
phpbb.prepareRolesDropdown(); phpbb.prepareRolesDropdown();
// Reset role drop-down on modifying permissions in advanced tab
$('div.permissions-switch > a').on('click', function () {
$.each($('input[type=radio][name^="setting["]'), function () {
var $this = $(this);
$this.on('click', function () {
var $rolesOptions = $this.closest('fieldset.permissions').find('.roles-options'),
rolesSelect = $rolesOptions.find('select > option')[0];
// Set selected setting
$rolesOptions.children('span')
.text(rolesSelect.text);
$rolesOptions.children('input[type=hidden]')
.val(rolesSelect.value);
});
});
});
}); });
})(jQuery); // Avoid conflicts with other libraries })(jQuery); // Avoid conflicts with other libraries