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

Toasts need to be stored globally or the variables may overwrite each other causeing a race-collision

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

29
scripts/pi-hole/js/settings-dhcp.js
View File

@@ -7,7 +7,8 @@
/* global utils:false, setConfigValues: false, apiFailure: false */
var dhcpLeaesTable = null;
var dhcpLeaesTable = null,
toasts = {};
// DHCP leases tooltips
$(function () {
@@ -163,7 +164,7 @@ function deleteLease() {
function delLease(ip) {
utils.disableAll();
const toast = utils.showAlert("info", "", "Deleting lease...", ip, null);
toasts[ip] = utils.showAlert("info", "", "Deleting lease...", ip, null);
$.ajax({
url: "/api/dhcp/leases/" + encodeURIComponent(ip),
@@ -172,10 +173,22 @@ function delLease(ip) {
.done(function (response) {
utils.enableAll();
if (response === undefined) {
utils.showAlert("success", "far fa-trash-alt", "Successfully deleted lease", ip, toast);
utils.showAlert(
"success",
"far fa-trash-alt",
"Successfully deleted lease",
ip,
toasts[ip]
);
dhcpLeaesTable.ajax.reload(null, false);
} else {
utils.showAlert("error", "", "Error while deleting lease: " + ip, response.lease, toast);
utils.showAlert(
"error",
"",
"Error while deleting lease: " + ip,
response.lease,
toasts[ip]
);
}
// Clear selection after deletion
@@ -184,7 +197,13 @@ function delLease(ip) {
})
.fail(function (jqXHR, exception) {
utils.enableAll();
utils.showAlert("error", "", "Error while deleting lease: " + ip, jqXHR.responseText, toast);
utils.showAlert(
"error",
"",
"Error while deleting lease: " + ip,
jqXHR.responseText,
toasts[ip]
);
console.log(exception); // eslint-disable-line no-console
});
}