Fix Device table not loading

jokob-sk · Jan 22, 2023 · 7baae28 · 7baae28
1 parent a33c503
commit 7baae28
Show file tree

Hide file tree

Showing 5 changed files with 27 additions and 22 deletions.
diff --git a/back/pialert.py b/back/pialert.py
@@ -3101,7 +3101,7 @@ def isNewVersion():
         except requests.exceptions.ConnectionError as e:
             file_print("    Couldn't check for new release.") 
             data = ""
-
+        
         # make sure we received a valid response and not an API rate limit exceeded message
         if len(data) > 0 and "published_at" in data[0]:        
 

diff --git a/docker-compose.yml b/docker-compose.yml
@@ -7,9 +7,9 @@ services:
     network_mode: "host"
     restart: unless-stopped
     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:/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
       - ${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

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

diff --git a/front/php/server/devices.php b/front/php/server/devices.php
@@ -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))
   $columnOrderMapping = array(
-    array("dev_Name", 0, -1),               
-    array("dev_Owner", 1, -1),              
-    array("dev_DeviceType", 2, -1),         
-    array("dev_Icon", 3, -1),               
-    array("dev_Favorite", 4, -1),           
-    array("dev_Group", 5, -1),              
-    array("dev_FirstConnection", 6, -1),    
-    array("dev_LastConnection", 7, -1),     
-    array("dev_LastIP", 8, -1),             
-    array("dev_MAC", 9, -1),                
-    array("dev_Status", 10, -1),            
-    array("dev_MAC_full", 11, -1),          
-    array("dev_LastIP_orderable", 12, -1),  
-    array("rowid", 13, -1),            
-    array("dev_Network_Node_MAC_ADDR", 14, -1)                  
+    array("dev_Name", 0, 0),               
+    array("dev_Owner", 1, 1),              
+    array("dev_DeviceType", 2, 2),         
+    array("dev_Icon", 3, 3),               
+    array("dev_Favorite", 4, 4),           
+    array("dev_Group", 5, 5),              
+    array("dev_FirstConnection", 6, 6),    
+    array("dev_LastConnection", 7, 7),     
+    array("dev_LastIP", 8, 8),             
+    array("dev_MAC", 9, 9),                
+    array("dev_Status", 10, 10),            
+    array("dev_MAC_full", 11, 11),          
+    array("dev_LastIP_orderable", 12, 12),  
+    array("rowid", 13, 13),            
+    array("dev_Network_Node_MAC_ADDR", 14, 14)                  
   );
 
   // get device columns order

diff --git a/front/php/templates/language/en_us.php b/front/php/templates/language/en_us.php
@@ -68,6 +68,7 @@
 'Device_TableHead_Type' => 'Type',
 'Device_TableHead_Icon' => 'Icon',
 'Device_TableHead_RowID' => 'Row ID',
+'Device_TableHead_Rowid' => 'Row ID',
 'Device_TableHead_Parent_MAC' => 'Parent node MAC',
 'Device_TableHead_Favorite' => 'Favorite',
 'Device_TableHead_Group' => 'Group',