cphipps/NetAlertX
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix 1 cycling thru devices #509🩹

Browse Source
This commit is contained in:
Jokob-sk
2023-11-22 19:00:52 +11:00
parent b234e1c859
commit a0a5410af9
2 changed files with 8 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
front/deviceDetails.php
View File

@@ -644,14 +644,15 @@ if ($ENABLED_DARKMODE === True) {
// ------------------------------------------------------------ // ------------------------------------------------------------
function getDevicesList() function getDevicesList()
{ {
// Read cache // Read cache (skip cookie expiry check)
devicesList = getCache('devicesList'); devicesList = getCache('devicesListAll_JSON', true);
if (devicesList != '') { if (devicesList != '') {
devicesList = JSON.parse (devicesList); devicesList = JSON.parse (devicesList);
} else { } else {
devicesList = []; devicesList = [];
} }
return devicesList; return devicesList;
} }
@@ -1283,7 +1284,7 @@ function getDeviceData (readAllData=false) {
history.pushState(null, '', newRelativePathQuery); history.pushState(null, '', newRelativePathQuery);
getSessionsPresenceEvents(); getSessionsPresenceEvents();
devicesList = getDevicesList(); devicesList = getDevicesList();
$('#txtMAC').val (deviceData['dev_MAC']); $('#txtMAC').val (deviceData['dev_MAC']);
$('#txtName').val (deviceData['dev_Name']); $('#txtName').val (deviceData['dev_Name']);
@@ -1324,7 +1325,8 @@ function getDeviceData (readAllData=false) {
} }
// Check if device is part of the devicesList // Check if device is part of the devicesList
pos = devicesList.findIndex(item => item.rowid == deviceData['rowid']); pos = devicesList.findIndex(item => item.rowid == deviceData['rowid']);
if (pos == -1) { if (pos == -1) {
devicesList.push({"rowid" : deviceData['rowid'], "mac" : deviceData['dev_MAC'], "name": deviceData['dev_Name'], "type": deviceData['dev_DeviceType']}); devicesList.push({"rowid" : deviceData['rowid'], "mac" : deviceData['dev_MAC'], "name": deviceData['dev_Name'], "type": deviceData['dev_DeviceType']});
pos=0; pos=0;
@@ -1398,7 +1400,7 @@ function performSwitch(direction)
// get new mac from the devicesList. Don't change to the commented out line below, the mac query string in the URL isn't updated yet! // get new mac from the devicesList. Don't change to the commented out line below, the mac query string in the URL isn't updated yet!
// mac = params.mac; // mac = params.mac;
mac = devicesList[pos].mac.toString(); mac = devicesList[pos].dev_MAC.toString();
setCache("piaDeviceDetailsMac", mac); setCache("piaDeviceDetailsMac", mac);

2
front/pluginsCore.php
View File

@@ -173,7 +173,7 @@ function processColumnValue(dbColumnDef, value, index, type) {
for (const option of dbColumnDef.options) { for (const option of dbColumnDef.options) {
if (option.type === type) { if (option.type === type) {
console.log(option.param) // console.log(option.param)
value = eval(option.param); value = eval(option.param);
} }
} }