v8.12.5 Release: Fix dependency page loading, Prevent loading of Highstock JS more than once

kizniche · kizniche · commit 7ce090e16fb9 · 2021-09-01T09:53:25.000-04:00
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,11 @@
+## 8.12.5 (2021-09-01)
+
+### Bugfixes
+
+ - Fix dependency page loading
+ - Prevent loading of Highstock JS more than once
+
+
 ## 8.12.4 (2021-08-31)
 
 ### Bugfixes
diff --git a/README.rst b/README.rst
@@ -3,7 +3,7 @@ Mycodo
 
 Environmental Regulation System
 
-Latest version: 8.12.4
+Latest version: 8.12.5
 
 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
 
-MYCODO_VERSION = '8.12.4'
+MYCODO_VERSION = '8.12.5'
 ALEMBIC_VERSION = '6e394f2e8fec'
 
 #  FORCE_UPGRADE_MASTER
diff --git a/mycodo/mycodo_flask/routes_admin.py b/mycodo/mycodo_flask/routes_admin.py
@@ -344,7 +344,7 @@ def admin_dependencies(device):
             if device in each_section:
                 # Determine if a message for the dependencies exists
                 if "dependencies_message" in each_section[device]:
-                    dependencies_message = each_section[device_name]["dependencies_message"]
+                    dependencies_message = each_section[device]["dependencies_message"]
 
                 # Find friendly name for device
                 for each_device_, each_val in each_section[device].items():
diff --git a/mycodo/mycodo_flask/templates/pages/dashboard.html b/mycodo/mycodo_flask/templates/pages/dashboard.html
@@ -2,6 +2,8 @@
 {% set active_page = "dashboard" %}
 {% set help_page = ["https://kizniche.github.io/Mycodo/Data-Viewing/#dashboard", dict_translation['dashboard']['title']] %}
 
+{% set dashboard_dict = dict() %}
+
 {% block title %} - {% for each_dash in dashboards if each_dash.unique_id == dashboard_id %}{{each_dash.name}}{% endfor %} {{dict_translation['dashboard']['title']}}{% endblock %}
 
 {% block head %}
diff --git a/mycodo/widgets/widget_gauge_angular.py b/mycodo/widgets/widget_gauge_angular.py
@@ -201,7 +201,10 @@ def generate_page_variables(widget_unique_id, widget_options):
         }
     ],
 
-    'widget_dashboard_head': """<script src="/static/js/user_js/highstock-9.1.2.js"></script>
+    'widget_dashboard_head': """{% if "highstock" not in dashboard_dict %}
+  <script src="/static/js/user_js/highstock-9.1.2.js"></script>
+  {% set _dummy = dashboard_dict.update({"highstock": 1}) %}
+{% endif %}
 <script src="/static/js/user_js/highcharts-more-9.1.2.js"></script>
 
 {% if current_user.theme in dark_themes %}
diff --git a/mycodo/widgets/widget_gauge_solid.py b/mycodo/widgets/widget_gauge_solid.py
@@ -223,7 +223,10 @@ def generate_page_variables(widget_unique_id, widget_options):
         }
     ],
 
-    'widget_dashboard_head': """<script src="/static/js/user_js/highstock-9.1.2.js"></script>
+    'widget_dashboard_head': """{% if "highstock" not in dashboard_dict %}
+  <script src="/static/js/user_js/highstock-9.1.2.js"></script>
+  {% set _dummy = dashboard_dict.update({"highstock": 1}) %}
+{% endif %}
 <script src="/static/js/user_js/highcharts-more-9.1.2.js"></script>
 <script src="/static/js/user_js/solid-gauge-9.1.2.js"></script>
 
diff --git a/mycodo/widgets/widget_graph_synchronous.py b/mycodo/widgets/widget_graph_synchronous.py
@@ -312,7 +312,10 @@ def generate_page_variables(widget_unique_id, widget_options):
         }
     ],
 
-    'widget_dashboard_head': """<script type="text/javascript" src="/static/js/user_js/highstock-9.1.2.js"></script>
+    'widget_dashboard_head': """{% if "highstock" not in dashboard_dict %}
+  <script type="text/javascript" src="/static/js/user_js/highstock-9.1.2.js"></script>
+  {% set _dummy = dashboard_dict.update({"highstock": 1}) %}
+{% endif %}
 <script type="text/javascript" src="/static/js/user_js/highcharts-more-9.1.2.js"></script>
 <script type="text/javascript" src="/static/js/user_js/data-9.1.2.js"></script>
 <script type="text/javascript" src="/static/js/user_js/exporting-9.1.2.js"></script>
