Gnous/mailcow
2
0
Fork 0
Code Issues Pull Requests 1 Packages Projects Releases Wiki Activity

[Web] Fix selection bug (reproduce: select an item, select all, deselect all, click an action and find previously selected items)

Browse Source
This commit is contained in:
andryyy 2020-03-01 11:21:23 +01:00
parent 7b9f5ac1c4
commit eb5d7f0609
No known key found for this signature in database
GPG Key ID: 8EC34FF2794E25EF
1 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
data/web/js/build/012-api.js
View File

@ -1,4 +1,5 @@
$(document).ready(function() { $(document).ready(function() {
mass_action = false;
function validateEmail(email) { function validateEmail(email) {
var re = /^(([^<>()[\]\\.,;:\s@\"]+(\.[^<>()[\]\\.,;:\s@\"]+)*)|(\".+\"))@((\[[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\])|(([a-zA-Z\-0-9]+\.)+[a-zA-Z]{2,}))$/; var re = /^(([^<>()[\]\\.,;:\s@\"]+(\.[^<>()[\]\\.,;:\s@\"]+)*)|(\".+\"))@((\[[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\])|(([a-zA-Z\-0-9]+\.)+[a-zA-Z]{2,}))$/;
return re.test(email); return re.test(email);
@ -35,7 +36,11 @@ $(document).ready(function() {
}; };
// Collect values of input fields with name "multi_select" and same data-id to js array multi_data[data-id] // Collect values of input fields with name "multi_select" and same data-id to js array multi_data[data-id]
var multi_data = []; var multi_data = [];
$(document).on('change', 'input[name=multi_select]:checkbox', function() { $(document).on('change', 'input[name=multi_select]:checkbox', function(e) {
if(mass_action === true) {
multi_data = [];
mass_action = false;
}
if ($(this).is(':checked') && $(this).data('id')) { if ($(this).is(':checked') && $(this).data('id')) {
var id = $(this).data('id'); var id = $(this).data('id');
if (typeof multi_data[id] == "undefined") { if (typeof multi_data[id] == "undefined") {
@ -45,7 +50,9 @@ $(document).ready(function() {
} }
else { else {
var id = $(this).data('id'); var id = $(this).data('id');
multi_data[id].splice($.inArray($(this).val(), multi_data[id]),1); if (typeof multi_data[id] !== "undefined") {
multi_data[id].splice($.inArray($(this).val(), multi_data[id]),1);
}
} }
}); });
@ -68,6 +75,7 @@ $(document).ready(function() {
// Select or deselect all checkboxes with same data-id // Select or deselect all checkboxes with same data-id
$(document).on('click', '#toggle_multi_select_all', function(e) { $(document).on('click', '#toggle_multi_select_all', function(e) {
mass_action = true
e.preventDefault(); e.preventDefault();
id = $(this).data("id"); id = $(this).data("id");
var all_checkboxes = $("input[data-id=" + id + "]:enabled"); var all_checkboxes = $("input[data-id=" + id + "]:enabled");