From 5e687e1bdb2ce879d7040a3d5c8044fde8ee6d24 Mon Sep 17 00:00:00 2001 From: Jokob-sk Date: Sun, 17 Mar 2024 10:52:28 +1100 Subject: [PATCH] =?UTF-8?q?Netw=20root=20node=20fixes=20=F0=9F=A9=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- front/deviceDetails.php | 12 +++++++++++- front/js/pialert_common.js | 2 +- 2 files changed, 12 insertions(+), 2 deletions(-) diff --git a/front/deviceDetails.php b/front/deviceDetails.php index 56073acd..fe920b98 100755 --- a/front/deviceDetails.php +++ b/front/deviceDetails.php @@ -1288,6 +1288,16 @@ function getDeviceData (readAllData=false) { devicesList = getDevicesList(); + // handle empty dev_Network_Node_MAC_ADDR + networkParentMac = deviceData['dev_Network_Node_MAC_ADDR'] + if(networkParentMac) + { + networkParentMacName = getDeviceDataByMacAddress(deviceData['dev_Network_Node_MAC_ADDR'], "dev_Name") + } else + { + networkParentMacName = '--' + } + $('#txtMAC').val (deviceData['dev_MAC']); $('#txtName').val (deviceData['dev_Name']); $('#txtOwner').val (deviceData['dev_Owner']); @@ -1300,7 +1310,7 @@ function getDeviceData (readAllData=false) { $('#txtGroup').val (deviceData['dev_Group']); $('#txtLocation').val (deviceData['dev_Location']); $('#txtComments').val (deviceData['dev_Comments']); - $('#txtNetworkNodeMac').val ( getDeviceDataByMacAddress(deviceData['dev_Network_Node_MAC_ADDR'], "dev_Name")) ; + $('#txtNetworkNodeMac').val ( networkParentMacName) ; $('#txtNetworkNodeMac').attr ('data-mynodemac', deviceData['dev_Network_Node_MAC_ADDR']); $('#txtNetworkPort').val (deviceData['dev_Network_Node_port']); // disabling network node configuration if root Internet node diff --git a/front/js/pialert_common.js b/front/js/pialert_common.js index 53cfd631..5ce4a213 100755 --- a/front/js/pialert_common.js +++ b/front/js/pialert_common.js @@ -1130,7 +1130,7 @@ function handleFirstLoad() setTimeout(function() { location.reload(); - }, 100); + }, 1000); } }