FE: cleaner getMac() + #1371

Signed-off-by: jokob-sk <jokob.sk@gmail.com>

front/js/common.js

@@ -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;
 }
 
 // -----------------------------------------------------------------------------

front/js/device.js

@@ -2,10 +2,8 @@
 
 // -----------------------------------------------------------------------------
 function askDeleteDevice() {
-  // Check MAC
+
-  if (mac == '') {
+  mac = getMac()
-    return;
-  }
 
   // Ask delete device
   showModalWarning(
@@ -19,9 +17,7 @@ function askDeleteDevice() {
 // -----------------------------------------------------------------------------
 function askDelDevDTInline(mac) {
   // Check MAC
-  if (mac == '') {
+  mac = getMac()
-    return;
-  }
 
   showModalWarning(
     getString("DevDetail_button_Delete"),
@@ -35,9 +31,7 @@ function askDelDevDTInline(mac) {
 // -----------------------------------------------------------------------------
 function deleteDevice() {
   // Check MAC
-  if (mac == '') {
+  mac = getMac()
-    return;
-  }
 
   // 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 == '') {
+  mac = getMac()
-    return;
-  }
 
   // alert(mac)
   // return;