database: robustify WebIf against empty DB entries

smarthomeNG · Jan 8, 2024 · 0ea42a7 · 0ea42a7
1 parent d06ba27
commit 0ea42a7
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 2 deletions.
diff --git a/database/__init__.py b/database/__init__.py
@@ -491,7 +491,6 @@ def db_lastchange(self, item):
         This is a public function of the plugin
 
         :param item: Item to get the ID for
-        :param cur: A database cursor object if available (optional)
 
         :return: id of the item within the database
         :rtype: int | None
@@ -512,6 +511,8 @@ def db_lastchange(self, item):
 
         id = int(row[COL_ITEM_ID])
         last_change = row[COL_ITEM_TIME]
+        if last_change is None:
+            return None
         return self._datetime(last_change)
 
 

diff --git a/database/webif/templates/index.html b/database/webif/templates/index.html
@@ -184,7 +184,20 @@
 			<tr>
 				<td></td>
 				<td id="{{ item }}_orphan_path">{{ item }}</td>
-			    <td id="{{ item }}_orphan_time">{% if language == 'en' %}{{ p.db_lastchange(item).strftime('%m/%d/%Y %H:%M:%S') }}{% else %}{{ p.db_lastchange(item).strftime('%d.%m.%Y %H:%M:%S') }}{% endif %}</td>
+			    <td id="{{ item }}_orphan_time">
+				{% if language == 'en' %}
+					{% if p.db_lastchange(item) is none %}
+						{{ _('Wert invalide') }}
+					{% else %}
+						{{ p.db_lastchange(item).strftime('%m/%d/%Y %H:%M:%S') }}
+					{% endif %}
+				{% else %}
+					{% if p.db_lastchange(item) is none %}
+						{{ _('Wert invalide') }}
+					{% else %}
+						{{ p.db_lastchange(item).strftime('%d.%m.%Y %H:%M:%S') }}
+					{% endif %}
+				{% endif %}</td>
 				<td id="{{ item }}_orphan_type">{{ _(p.db_itemtype(item)) }}</td>
 				<td id="{{ item }}_orphan_id">{{ p.id(item, create=False) }}</td>
 				{%  if p.count_logentries %}