Merge remote-tracking branch 'upstream/develop' into kodi

smarthomeNG · Jul 27, 2023 · 4987a00 · 4987a00
2 parents 38f8d85 + 590038a
commit 4987a00
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 16 deletions.
diff --git a/smartvisu/__init__.py b/smartvisu/__init__.py
@@ -46,7 +46,7 @@
 
 class SmartVisu(SmartPlugin):
 
-    PLUGIN_VERSION="1.8.11"
+    PLUGIN_VERSION="1.8.12"
     ALLOW_MULTIINSTANCE = True
 
     visu_definition = None
@@ -125,7 +125,8 @@ def __init__(self, sh):
 
     def run(self):
         self.alive = True
-        if self.smartvisu_dir != '':
+        # skip directory handling if all relevant handling options are disabled
+        if self.smartvisu_dir != '' and (self._generate_pages or self._handle_widgets or self._create_masteritem_file):
             if not os.path.isdir(os.path.join(self.smartvisu_dir, 'pages')):
                 self.logger.error("Could not find valid smartVISU directory: {}".format(self.smartvisu_dir))
             else:

diff --git a/smartvisu/plugin.yaml b/smartvisu/plugin.yaml
@@ -12,7 +12,7 @@ plugin:
     #documentation: ''
     support: https://knx-user-forum.de/forum/supportforen/smarthome-py/1586800-support-thread-für-das-smartvisu-plugin
 
-    version: 1.8.11                # Plugin version
+    version: 1.8.12                # Plugin version
     sh_minversion: 1.9.3.5         # minimum shNG version to use this plugin
 #    sh_maxversion:                 # maximum shNG version to use this plugin (leave empty if latest)
     py_minversion: 3.6             # minimum Python version to use for this plugin

diff --git a/tasmota/webif/templates/index.html b/tasmota/webif/templates/index.html
@@ -696,7 +696,6 @@
 
 
 {% block bodytab6 %}
-<!--
 <div class="container-fluid m-2">
     <table id="" class="table table-striped table-hover pluginList">
         <thead>
@@ -706,40 +705,41 @@
             </tr>
         </thead>
         <tbody>
-            {% for device in p.tasmota_objects_dict %}
+            {% for device in p.tasmota_devices %}
                 <tr>
                     <td>{{ device }}</td>
-                    <td>{{ p.tasmota_objects_dict[device] }}</td>
+                    <td>{{ p.tasmota_devices[device] }}</td>
                 </tr>
             {% endfor %}
         </tbody>
     </table>
 </div>
--->
+
+</br>
+</br>
 
 <div class="container-fluid m-2">
     <table id="" class="table table-striped table-hover pluginList">
         <thead>
             <tr class="shng_heading">
-                <th>{{ _('Tasmota Device') }}</th>
-                <th>{{ _('Tasmota Device Details') }}</th>
+                <th>{{ _('Tasmota Items') }}</th>
+                <th>{{ _('Tasmota Item Config') }}</th>
             </tr>
         </thead>
         <tbody>
-            {% for device in p.tasmota_devices %}
+            {% for item in p.get_item_list() %}
                 <tr>
-                    <td>{{ device }}</td>
-                    <td>{{ p.tasmota_devices[device] }}</td>
+                    <td>{{ item }}</td>
+                    <td>{{ p.get_item_config(item) }}</td>
                 </tr>
             {% endfor %}
-            <tr>
-                <td>{{ '_plg_item_dict' }}</td>
-                <td>{{ p._plg_item_dict }}</td>
-            </tr>
         </tbody>
     </table>
 </div>
 
+</br>
+</br>
+
 <div class="container-fluid m-2">
     <table id="" class="table table-striped table-hover pluginList">
         <thead>