FE: cleaner getMac() + #1371

Signed-off-by: jokob-sk <jokob.sk@gmail.com>
This commit is contained in:
jokob-sk
2025-12-29 07:51:46 +11:00
parent eb414b7e70
commit 494451b316
2 changed files with 17 additions and 19 deletions

View File

@@ -920,7 +920,13 @@ function getMac(){
get: (searchParams, prop) => searchParams.get(prop),
});
return params.mac
mac = params.mac;
if (mac == "") {
console.error("Couldn't retrieve mac");
}
return mac;
}
// -----------------------------------------------------------------------------

View File

@@ -2,32 +2,28 @@
// -----------------------------------------------------------------------------
function askDeleteDevice() {
// Check MAC
if (mac == '') {
return;
}
mac = getMac()
// Ask delete device
showModalWarning(
getString("DevDetail_button_Delete"),
getString("DevDetail_button_Delete_ask"),
getString('Gen_Cancel'),
getString('Gen_Delete'),
getString('Gen_Cancel'),
getString('Gen_Delete'),
'deleteDevice');
}
// -----------------------------------------------------------------------------
function askDelDevDTInline(mac) {
// Check MAC
if (mac == '') {
return;
}
mac = getMac()
showModalWarning(
getString("DevDetail_button_Delete"),
getString("DevDetail_button_Delete"),
getString("DevDetail_button_Delete_ask"),
getString('Gen_Cancel'),
getString('Gen_Delete'),
getString('Gen_Cancel'),
getString('Gen_Delete'),
() => deleteDeviceByMac(mac))
}
@@ -35,9 +31,7 @@ function askDelDevDTInline(mac) {
// -----------------------------------------------------------------------------
function deleteDevice() {
// Check MAC
if (mac == '') {
return;
}
mac = getMac()
// Delete device
$.get('php/server/devices.php?action=deleteDevice&mac=' + mac, function (msg) {
@@ -51,9 +45,7 @@ function deleteDevice() {
// -----------------------------------------------------------------------------
function deleteDeviceByMac(mac) {
// Check MAC
if (mac == '') {
return;
}
mac = getMac()
// alert(mac)
// return;