Pi-Hole/web
1
0
Fork 0
mirror of https://github.com/pi-hole/web.git synced 2025-12-20 10:48:26 +00:00
Code Issues Packages Projects Releases Wiki Activity

Apply the same fixes for the messages table

Browse Source 
Signed-off-by: DL6ER <dl6er@dl6er.de>
This commit is contained in:
DL6ER
2024-06-03 19:19:00 +02:00
parent 420c5a83b4
commit edda66f95e
1 changed files with 25 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

51
scripts/pi-hole/js/messages.js
View File

@@ -6,7 +6,8 @@
* Please see LICENSE file for your rights under this license. */
/* global utils:false */
var table;
var table,
toasts = {};
$(function () {
var ignoreNonfatal = localStorage
@@ -147,26 +148,16 @@ $.fn.dataTable.Buttons.defaults.dom.container.className = "dt-buttons";
function deleteMessage() {
// Passes the button data-del-id attribute as ID
var ids = [parseInt($(this).attr("data-del-id"), 10)];
// Check input validity
if (!Array.isArray(ids)) return;
// Exploit prevention: Return early for non-numeric IDs
for (var id in ids) {
if (Object.hasOwnProperty.call(ids, id)) {
if (typeof ids[id] !== "number") return;
delMsg(ids);
}
}
delMsg($(this).attr("data-del-id"));
}
function delMsg(ids) {
function delMsg(id) {
id = parseInt(id, 10);
utils.disableAll();
utils.showAlert("info", "", "Deleting message...");
toasts[id] = utils.showAlert("info", "", "Deleting message...", null, null);
$.ajax({
url: "/api/info/messages/" + ids,
url: "/api/info/messages/" + id,
method: "DELETE",
})
.done(function (response) {
@@ -175,19 +166,21 @@ function delMsg(ids) {
utils.showAlert(
"success",
"far fa-trash-alt",
"Successfully deleted " + ids.length + " message" + (ids.length > 1 ? "s" : ""),
""
"Successfully deleted message",
"",
toasts[id]
);
// Loop over id in case of multiple IDs
for (var id in ids) {
if (Object.hasOwnProperty.call(ids, id)) {
table.row(id).remove();
}
}
table.row(id).remove();
table.draw(false).ajax.reload(null, false);
} else {
utils.showAlert("error", "", "Error while deleting message: " + ids, response.message);
utils.showAlert(
"error",
"",
"Error while deleting message: " + id,
response.message,
toasts[id]
);
}
// Clear selection after deletion
@@ -199,7 +192,13 @@ function delMsg(ids) {
)
.fail(function (jqXHR, exception) {
utils.enableAll();
utils.showAlert("error", "", "Error while deleting message: " + ids, jqXHR.responseText);
utils.showAlert(
"error",
"",
"Error while deleting message: " + id,
jqXHR.responseText,
toasts[id]
);
console.log(exception); // eslint-disable-line no-console
});
}