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

Fix Device table not loading

Browse Source
This commit is contained in:
Jokob-sk
2023-01-23 00:03:34 +11:00
parent a33c50361f
commit 7baae289d1
5 changed files with 27 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
docker-compose.yml
View File

@@ -7,9 +7,9 @@ services:
network_mode: "host" network_mode: "host"
restart: unless-stopped restart: unless-stopped
volumes: volumes:
- ${APP_DATA_LOCATION}/pialert/config:/home/pi/pialert/config - ${APP_DATA_LOCATION}/pialert/config2:/home/pi/pialert/config
# - ${APP_DATA_LOCATION}/pialert/db/pialert.db:/home/pi/pialert/db/pialert.db # - ${APP_DATA_LOCATION}/pialert/db/pialert.db:/home/pi/pialert/db/pialert.db
- ${APP_DATA_LOCATION}/pialert/db:/home/pi/pialert/db - ${APP_DATA_LOCATION}/pialert/db2:/home/pi/pialert/db
# (optional) useful for debugging if you have issues setting up the container # (optional) useful for debugging if you have issues setting up the container
- ${LOGS_LOCATION}:/home/pi/pialert/front/log - ${LOGS_LOCATION}:/home/pi/pialert/front/log
# DELETE START anyone trying to use this file: comment out / delete BELOW lines, they are only for development purposes # DELETE START anyone trying to use this file: comment out / delete BELOW lines, they are only for development purposes

8
front/js/pialert_common.js
View File

@@ -292,12 +292,16 @@ function settingsChanged()
// ----------------------------------------------------------------------------- // -----------------------------------------------------------------------------
function translateHTMLcodes (text) { function translateHTMLcodes (text) {
if (text == null) { if (text == null || emptyArr.includes(text)) {
return null; return null;
} } else if (typeof text === 'string' || text instanceof String)
{
var text2 = text.replace(new RegExp(' ', 'g'), "&nbsp"); var text2 = text.replace(new RegExp(' ', 'g'), "&nbsp");
text2 = text2.replace(new RegExp('<', 'g'), "&lt"); text2 = text2.replace(new RegExp('<', 'g'), "&lt");
return text2; return text2;
}
return "";
} }

30
front/php/server/devices.php
View File

@@ -571,21 +571,21 @@ function getDevicesList() {
// This object is used to map from the old order ( second parameter, first number) to the 3rd parameter (Second number (here initialized to -1)) // This object is used to map from the old order ( second parameter, first number) to the 3rd parameter (Second number (here initialized to -1))
$columnOrderMapping = array( $columnOrderMapping = array(
array("dev_Name", 0, -1), array("dev_Name", 0, 0),
array("dev_Owner", 1, -1), array("dev_Owner", 1, 1),
array("dev_DeviceType", 2, -1), array("dev_DeviceType", 2, 2),
array("dev_Icon", 3, -1), array("dev_Icon", 3, 3),
array("dev_Favorite", 4, -1), array("dev_Favorite", 4, 4),
array("dev_Group", 5, -1), array("dev_Group", 5, 5),
array("dev_FirstConnection", 6, -1), array("dev_FirstConnection", 6, 6),
array("dev_LastConnection", 7, -1), array("dev_LastConnection", 7, 7),
array("dev_LastIP", 8, -1), array("dev_LastIP", 8, 8),
array("dev_MAC", 9, -1), array("dev_MAC", 9, 9),
array("dev_Status", 10, -1), array("dev_Status", 10, 10),
array("dev_MAC_full", 11, -1), array("dev_MAC_full", 11, 11),
array("dev_LastIP_orderable", 12, -1), array("dev_LastIP_orderable", 12, 12),
array("rowid", 13, -1), array("rowid", 13, 13),
array("dev_Network_Node_MAC_ADDR", 14, -1) array("dev_Network_Node_MAC_ADDR", 14, 14)
); );
// get device columns order // get device columns order

1
front/php/templates/language/en_us.php
View File

@@ -68,6 +68,7 @@ $lang['en_us'] = array(
'Device_TableHead_Type' => 'Type', 'Device_TableHead_Type' => 'Type',
'Device_TableHead_Icon' => 'Icon', 'Device_TableHead_Icon' => 'Icon',
'Device_TableHead_RowID' => 'Row ID', 'Device_TableHead_RowID' => 'Row ID',
'Device_TableHead_Rowid' => 'Row ID',
'Device_TableHead_Parent_MAC' => 'Parent node MAC', 'Device_TableHead_Parent_MAC' => 'Parent node MAC',
'Device_TableHead_Favorite' => 'Favorite', 'Device_TableHead_Favorite' => 'Favorite',
'Device_TableHead_Group' => 'Group', 'Device_TableHead_Group' => 'Group',