Merge pull request #71 from ppfeufer/development

[FIX] JS order in template
ppfeufer · Jul 11, 2022 · 27fdde6 · 27fdde6
2 parents a77f058 + 2390015
commit 27fdde6
Show file tree

Hide file tree

Showing 4 changed files with 17 additions and 8 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -9,6 +9,13 @@ and this project adheres to [Semantic Versioning](http://semver.org/)
 ## [In Development] - Unreleased
 
 
+## [1.15.1] - 2022-07-11
+
+### Fixed
+
+- JS order in template
+
+
 ## [1.15.0] - 2022-07-11
 
 ### Fixed

diff --git a/aasrp/__init__.py b/aasrp/__init__.py
@@ -2,5 +2,5 @@
 A couple of variable to use throughout the app
 """
 
-__version__ = "1.15.0"
+__version__ = "1.15.1"
 __title__ = "Ship Replacement"
diff --git a/aasrp/templates/aasrp/dashboard.html b/aasrp/templates/aasrp/dashboard.html
@@ -29,9 +29,6 @@
 {% endblock %}
 
 {% block extra_javascript %}
-    {% include 'bundles/datatables-js.html' %}
-    {% include 'bundles/filterdropdown-js.html' %}
-    {% include 'bundles/moment-js.html' with locale=True %}
     {% include 'bundles/clipboard-js.html' %}
 
     <script type="application/javascript">
@@ -47,6 +44,10 @@
         });
     </script>
 
+    {% include 'bundles/datatables-js.html' %}
+    {% include 'bundles/moment-js.html' with locale=True %}
+    {% include 'bundles/filterdropdown-js.html' %}
+
     <script type="application/javascript" src="{% static 'aasrp/libs/datatables/plugins/datetime.js' %}"></script>
 
     <script type="application/javascript">

diff --git a/aasrp/templates/aasrp/view_requests.html b/aasrp/templates/aasrp/view_requests.html
@@ -29,11 +29,7 @@
 {% endblock %}
 
 {% block extra_javascript %}
-    {% include 'bundles/moment-js.html' with locale=True %}
-    {% include 'bundles/datatables-js.html' %}
-    {% include 'bundles/filterdropdown-js.html' %}
     {% include 'bundles/clipboard-js.html' %}
-    {% include 'aasrp/bundles/x-editable-js.html' %}
 
     <script type="application/javascript">
         let clipboard = new ClipboardJS('.copy-text-fa-icon');
@@ -48,6 +44,11 @@
         });
     </script>
 
+    {% include 'aasrp/bundles/x-editable-js.html' %}
+    {% include 'bundles/moment-js.html' with locale=True %}
+    {% include 'bundles/datatables-js.html' %}
+    {% include 'bundles/filterdropdown-js.html' %}
+
     <script type="application/javascript" src="{% static 'aasrp/libs/datatables/plugins/datetime.min.js' %}"></script>
 
     <script type="application/javascript">