From 1e13bf66297bad8fdf0e1fdfb0f94801281da20b Mon Sep 17 00:00:00 2001 From: jokob-sk Date: Sat, 7 Jun 2025 07:14:04 +1000 Subject: [PATCH] devMac in wf --- front/css/app.css | 5 +++++ front/devices.php | 2 +- front/js/common.js | 2 +- front/userNotifications.php | 9 +++++---- front/workflowsCore.php | 2 +- 5 files changed, 13 insertions(+), 7 deletions(-) diff --git a/front/css/app.css b/front/css/app.css index 3b90b3ee..10db0bd5 100755 --- a/front/css/app.css +++ b/front/css/app.css @@ -875,6 +875,11 @@ height: 50px; margin-bottom: 10px; } +#notifications .notification-buttons{ + margin: 10px; + padding: 10px; +} + #notificationData textarea{ width: 100%; } diff --git a/front/devices.php b/front/devices.php index 16c01952..c9ba816c 100755 --- a/front/devices.php +++ b/front/devices.php @@ -848,7 +848,7 @@ function initializeDatatable (status) { {targets: [mapIndx(26)], 'createdCell': function (td, cellData, rowData, row, col) { if (!emptyArr.includes(cellData)){ - $(td).html (`${renderCustomProps(cellData, rowData[mapIndx(11)])}`); + $(td).html (`${renderCustomProps(cellData, rowData[mapIndx(11)])}`); } else { $(td).html (''); } diff --git a/front/js/common.js b/front/js/common.js index 7bbaaa11..f0b03169 100755 --- a/front/js/common.js +++ b/front/js/common.js @@ -1534,7 +1534,7 @@ const handleFailure = (callName, callback) => { msg = `AJAX call ${callName} failed` console.error(msg); // Implement retry logic here if needed - write_notification(msg, 'interrupt') + // write_notification(msg, 'interrupt') }; // ----------------------------------------------------------------------------- diff --git a/front/userNotifications.php b/front/userNotifications.php index 72dcc094..c53b9d9d 100755 --- a/front/userNotifications.php +++ b/front/userNotifications.php @@ -12,7 +12,7 @@ require 'php/templates/header.php';
-
+

@@ -33,9 +33,10 @@ require 'php/templates/header.php'; - - - +
+ + +
diff --git a/front/workflowsCore.php b/front/workflowsCore.php index 5cba7801..91fbe175 100755 --- a/front/workflowsCore.php +++ b/front/workflowsCore.php @@ -39,7 +39,7 @@ let workflows = []; let fieldOptions = [ - "devName", "devOwner", "devType", "devVendor", "devFavorite", + "devName", "devMac", "devOwner", "devType", "devVendor", "devFavorite", "devGroup", "devComments", "devFirstConnection", "devLastConnection", "devLastIP", "devStaticIP", "devScan", "devLogEvents", "devAlertEvents", "devAlertDown", "devSkipRepeated", "devLastNotification", "devPresentLastScan",