makary/phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-06-08 04:18:52 +00:00
Code Issues Projects Releases Packages Wiki Activity

[ticket/9590] Preserve selected forums after previous page redirect

Browse source 
Also improved the way the forum ID list is generated when clicking
on "Apply all permissions".

PHPBB3-9590
This commit is contained in:
Marc Alexander 2016-11-26 23:31:52 +01:00
parent 30b3fbb2cf
commit b01b3b8b94
No known key found for this signature in database
GPG key ID: 50E0D2423696F995
1 changed files with 28 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

47
phpBB/adm/style/ajax.js
View file

@ -89,14 +89,15 @@ function submitPermissions() {
}); });
} else { } else {
formDataSets[0] = $form.find('fieldset#' + $submitButton.closest('fieldset.permissions').id).serialize(); formDataSets[0] = $form.find('fieldset#' + $submitButton.closest('fieldset.permissions').id).serialize();
// Add each forum ID to forum ID list to preserve selected forums
$.each($form.find('input[type=hidden][name^=forum_id]'), function (key, value) {
if (value.name.match(/^forum_id\[([0-9]+)\]$/)) {
forumIds.push(value.value);
}
});
} }
// Add each forum ID to forum ID list to preserve selected forums
$.each($form.find('input[type=hidden][name^=forum_id]'), function (key, value) {
if (value.name.match(/^forum_id\[([0-9]+)\]$/)) {
forumIds.push(value.value);
}
});
/** /**
* Handler for submitted permissions form chunk * Handler for submitted permissions form chunk
* *
@ -110,21 +111,29 @@ function submitPermissions() {
phpbb.alert(res.MESSAGE_TITLE, res.MESSAGE_TEXT); phpbb.alert(res.MESSAGE_TITLE, res.MESSAGE_TEXT);
permissionSubmitFailed = true; permissionSubmitFailed = true;
} else if (!permissionSubmitFailed && res.S_USER_NOTICE) { } else if (!permissionSubmitFailed && res.S_USER_NOTICE) {
// Fill list of selected forums
if (typeof res.REFRESH_DATA !== 'undefined') {
$.each(res.REFRESH_DATA.url.split('&'), function (key, value){
var forumIdMatch = value.match(/^forum_id\[\]=([0-9]+)$/);
if (forumIdMatch !== null) {
forumIds.push(forumIdMatch[1]);
// Remove added forum IDs from refresh URL
res.REFRESH_DATA.url = res.REFRESH_DATA.url.replace('&' + forumIdMatch[0], '');
}
});
}
// Display success message at the end of submitting the form // Display success message at the end of submitting the form
if (permissionRequestCount >= permissionSubmitSize) { if (permissionRequestCount >= permissionSubmitSize) {
var $alert = phpbb.alert(res.MESSAGE_TITLE, res.MESSAGE_TEXT); var $alert = phpbb.alert(res.MESSAGE_TITLE, res.MESSAGE_TEXT);
var $alertBoxLink = $alert.find('p.alert_text > a');
// Create form to submit instead of normal "Back to previous page" link
if ($alertBoxLink) {
// Remove forum_id[] from URL
$alertBoxLink.attr('href', $alertBoxLink.attr('href').replace(/(&forum_id\[\]=[0-9]+)/, ''));
var previousPageForm = '<form action="' + $alertBoxLink.attr('href') + '" method="post">';
$.each(forumIds, function (key, value) {
previousPageForm += '<input type="text" name="forum_id[]" value="' + value + '" />';
});
previousPageForm += '</form>';
$alertBoxLink.on('click', function (e) {
var $previousPageForm = $(previousPageForm);
$('body').append($previousPageForm);
e.preventDefault();
$previousPageForm.submit();
});
}
// Do not allow closing alert // Do not allow closing alert
$dark.off('click'); $dark.off('click');
$alert.find('.alert_close').hide(); $alert.find('.alert_close').hide();
@ -133,7 +142,7 @@ function submitPermissions() {
setTimeout(function () { setTimeout(function () {
// Create forum to submit using POST. This will prevent // Create forum to submit using POST. This will prevent
// exceeding the maximum length of URLs // exceeding the maximum length of URLs
var form = '<form action="' + res.REFRESH_DATA.url + '" method="post">'; var form = '<form action="' + res.REFRESH_DATA.url.replace(/(&forum_id\[\]=[0-9]+)/, '') + '" method="post">';
$.each(forumIds, function (key, value) { $.each(forumIds, function (key, value) {
form += '<input type="text" name="forum_id[]" value="' + value + '" />'; form += '<input type="text" name="forum_id[]" value="' + value + '" />';
}); });