Archived devices were shown #920

front/js/device.js

@@ -1,28 +1,47 @@
 
 
 // -----------------------------------------------------------------------------
-function askDeleteDevice () {
+function askDeleteDevice() {
   // Check MAC
   if (mac == '') {
     return;
   }
 
   // Ask delete device
-  showModalWarning ('Delete Device', 'Are you sure you want to delete this device?<br>(maybe you prefer to archive it)',
-    getString('Gen_Cancel'), getString('Gen_Delete'), 'deleteDevice');
+  showModalWarning(
+    getString("DevDetail_button_Delete"),
+    getString("DevDetail_button_Delete_ask"),
+    getString('Gen_Cancel'), 
+    getString('Gen_Delete'), 
+    'deleteDevice');
+}
+
+// -----------------------------------------------------------------------------
+function askDelDevDTInline(mac) {
+  // Check MAC
+  if (mac == '') {
+    return;
+  }
+
+  showModalWarning(
+    getString("DevDetail_button_Delete"), 
+    getString("DevDetail_button_Delete_ask"),
+    getString('Gen_Cancel'), 
+    getString('Gen_Delete'), 
+    () => deleteDeviceByMac(mac))
 }
 
 
 // -----------------------------------------------------------------------------
-function deleteDevice () {
+function deleteDevice() {
   // Check MAC
   if (mac == '') {
     return;
   }
 
   // Delete device
-  $.get('php/server/devices.php?action=deleteDevice&mac='+ mac, function(msg) {
-    showMessage (msg);
+  $.get('php/server/devices.php?action=deleteDevice&mac=' + mac, function (msg) {
+    showMessage(msg);
   });
 
   // refresh API
@@ -30,18 +49,22 @@ function deleteDevice () {
 }
 
 // -----------------------------------------------------------------------------
-function deleteDeviceByMac (mac) {
+function deleteDeviceByMac(mac) {
   // Check MAC
   if (mac == '') {
-      return;
+    return;
   }
 
+  // alert(mac)
+  // return;
+
   // Delete device
-  $.get('php/server/devices.php?action=deleteDevice&mac='+ mac, function(msg) {
-      showMessage (msg);
+  $.get('php/server/devices.php?action=deleteDevice&mac=' + mac, function (msg) {
+    showMessage(msg);
   });
 
   // refresh API
   updateApi("devices,appevents")
 }
-    
+
+

front/js/modal.js

@@ -65,7 +65,8 @@ function showModalWarning(
     message,
     btnCancel = getString("Gen_Cancel"),
     btnOK = getString("Gen_Okay"),
-    callbackFunction = null
+    callbackFunction = null,
+    triggeredBy = null
 ) {
     // set captions
     $("#modal-warning-title").html(title);
@@ -77,6 +78,10 @@ function showModalWarning(
         modalCallbackFunction = callbackFunction;
     }
 
+    if (triggeredBy != null) {
+        $('#'+prefix).attr("data-myparam-triggered-by", triggeredBy)
+    }
+
     // Show modal
     $("#modal-warning").modal("show");
 }

front/js/settings_utils.js

@@ -1159,7 +1159,8 @@ function generateFormHtml(settingsData, set, overrideValue, overrideOptions, ori
         $(document).ready(() => {
           $(`#${tableId}`).DataTable({
             ordering: false, // Disables sorting on all columns
-            searching: false // Disables the search box
+            searching: false, // Disables the search box
+            dom: "<'top'rt><'bottom'ipl>", // Move length dropdown to the bottom
           });
         });