Merge pull request #765 from sisamiwe/tasmota-update

Tasmota Plugin: revert direct use of _plg_item_dict in WebIF
smarthomeNG · Jul 27, 2023 · 52059a6 · 52059a6
2 parents 4e823f5 + a837fa2
commit 52059a6
Showing 1 changed file with 13 additions and 13 deletions.
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>