v8.13.7 bugfix release

ThingsEngine · Apr 6, 2022 · af7eeec · af7eeec
1 parent c7a106d
commit af7eeec
Show file tree

Hide file tree

Showing 8 changed files with 19 additions and 11 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,10 @@
+## 8.13.7 (2022-04-06)
+
+### Bugfixes
+
+ - Fix showing graph widgets with Outputs that have no name custom option
+
+
 ## 8.13.6 (2022-04-06)
 
 ### Bugfixes

diff --git a/README.rst b/README.rst
@@ -3,7 +3,7 @@ Mycodo
 
 Environmental Regulation System
 
-Latest version: 8.13.6
+Latest version: 8.13.7
 
 Mycodo is open source software for the Raspberry Pi that couples inputs and outputs in interesting ways to sense and manipulate the environment.
 

diff --git a/mycodo/config.py b/mycodo/config.py
@@ -13,7 +13,7 @@
 sys.path.append(os.path.abspath(os.path.dirname(__file__)))
 from config_translations import TRANSLATIONS as T
 
-MYCODO_VERSION = '8.13.6'
+MYCODO_VERSION = '8.13.7'
 ALEMBIC_VERSION = 'b354722c9b8b'
 
 #  FORCE_UPGRADE_MASTER

diff --git a/mycodo/outputs/on_off_hs300.py b/mycodo/outputs/on_off_hs300.py
@@ -79,7 +79,6 @@
         }
     ],
 
-
     'custom_channel_options': [
         {
             'id': 'name',

diff --git a/mycodo/outputs/on_off_hs300_0_4_2.py b/mycodo/outputs/on_off_hs300_0_4_2.py
@@ -79,7 +79,6 @@
         }
     ],
 
-
     'custom_channel_options': [
         {
             'id': 'name',

diff --git a/mycodo/outputs/on_off_kp303.py b/mycodo/outputs/on_off_kp303.py
@@ -79,7 +79,6 @@
         }
     ],
 
-
     'custom_channel_options': [
         {
             'id': 'name',

diff --git a/mycodo/outputs/on_off_kp303_0_4_2.py b/mycodo/outputs/on_off_kp303_0_4_2.py
@@ -79,7 +79,6 @@
         }
     ],
 
-
     'custom_channel_options': [
         {
             'id': 'name',

diff --git a/mycodo/widgets/widget_graph_synchronous.py b/mycodo/widgets/widget_graph_synchronous.py
@@ -993,11 +993,16 @@ def generate_page_variables(widget_unique_id, widget_options):
 
         {{' (CH' + (device_measurements_dict[measurement_id].channel)|string}}
 
-        {%- for channel_num in dict_outputs[this_output.output_type]['channels_dict'] -%}
-          {%- if device_measurements_dict[measurement_id].channel in dict_outputs[this_output.output_type]['channels_dict'][channel_num]['measurements'] -%}
-            {{', ' + custom_options_values_output_channels[output_id][channel_num]['name']}}
-          {%- endif -%}
-        {%- endfor -%}
+        {%- if 'channels_dict' in dict_outputs[this_output.output_type] -%}
+          {%- for channel_num in dict_outputs[this_output.output_type]['channels_dict'] -%}
+            {%- if device_measurements_dict[measurement_id].channel in dict_outputs[this_output.output_type]['channels_dict'][channel_num]['measurements'] and
+                   output_id in custom_options_values_output_channels and
+                   channel_num in custom_options_values_output_channels[output_id] and
+                   'name' in custom_options_values_output_channels[output_id][channel_num] -%}
+              {{', ' + custom_options_values_output_channels[output_id][channel_num]['name']}}
+            {%- endif -%}
+          {%- endfor -%}
+        {%- endif -%}
 
         {%- if dict_measure_measurements[measurement_id] in dict_measurements and
                dict_measurements[dict_measure_measurements[measurement_id]]['name'] -%}
-Original file line number
+Diff line change
@@ Expand Up / @@ -79,7 +79,6 @@ @@
             }
         ],
         'custom_channel_options': [
             {
                 'id': 'name',
@@ Expand Down @@