diff --git a/front/deviceDetailsEdit.php b/front/deviceDetailsEdit.php index fa8d393a..317de6d7 100755 --- a/front/deviceDetailsEdit.php +++ b/front/deviceDetailsEdit.php @@ -488,6 +488,7 @@ function setDeviceData(direction = '', refreshCallback = '') { if (resp && resp.success) { showMessage(getString("Device_Saved_Success")); + hideDetailsTabSkeleton(); } else { console.log(resp); diff --git a/front/devices.php b/front/devices.php index 79f5ff58..c4f124ab 100755 --- a/front/devices.php +++ b/front/devices.php @@ -921,8 +921,8 @@ function initializeDatatable (status) { ` data-mac="${row[mapIndx(COL.devMac)]}"` + ` data-vendor="${row[mapIndx(COL.devVendor)]}"` + ` data-type="${row[mapIndx(COL.devType)]}"` + - ` data-firstseen="${row[mapIndx(COL.devFirstConnection)]}"` + - ` data-lastseen="${row[mapIndx(COL.devLastConnection)]}"` + + ` data-firstseen="${localizeTimestamp(row[mapIndx(COL.devFirstConnection)])}"` + + ` data-lastseen="${localizeTimestamp(row[mapIndx(COL.devLastConnection)])}"` + ` data-relationship="${row[mapIndx(COL.devParentRelType)]}"` + ` data-status="${row[mapIndx(COL.devStatus)]}"` + ` data-present="${row[mapIndx(COL.devPresentLastScan)]}"` + diff --git a/front/js/network-tree.js b/front/js/network-tree.js index 0f8f4f2f..078239d5 100644 --- a/front/js/network-tree.js +++ b/front/js/network-tree.js @@ -284,8 +284,8 @@ function initTree(myHierarchy) data-vendor="${nodeData.data.devVendor}" data-type="${nodeData.data.devType}" data-devIsNetworkNodeDynamic="${nodeData.data.devIsNetworkNodeDynamic}" - data-lastseen="${nodeData.data.devLastConnection}" - data-firstseen="${nodeData.data.devFirstConnection}" + data-lastseen="${localizeTimestamp(nodeData.data.devLastConnection)}" + data-firstseen="${localizeTimestamp(nodeData.data.devFirstConnection)}" data-relationship="${nodeData.data.devParentRelType}" data-flapping="${nodeData.data.devFlapping}" data-sleeping="${nodeData.data.devIsSleeping || 0}" diff --git a/front/js/ui_components.js b/front/js/ui_components.js index 1cd0a863..917ff860 100755 --- a/front/js/ui_components.js +++ b/front/js/ui_components.js @@ -980,8 +980,8 @@ function renderDeviceLink(data, container, useName = false) { 'data-mac': device.devMac, 'data-vendor': device.devVendor, 'data-type': device.devType, - 'data-lastseen': device.devLastConnection, - 'data-firstseen': device.devFirstConnection, + 'data-lastseen': localizeTimestamp(device.devLastConnection), + 'data-firstseen': localizeTimestamp(device.devFirstConnection), 'data-relationship': device.devParentRelType, 'data-status': device.devStatus, 'data-flapping': device.devFlapping, diff --git a/front/php/templates/skel_devices.php b/front/php/templates/skel_devices.php index 1fd09de3..6d6638d7 100644 --- a/front/php/templates/skel_devices.php +++ b/front/php/templates/skel_devices.php @@ -1,5 +1,5 @@ -