Merge pull request #8 from 5genesis/moment-fix

Moment fix
5genesis · Jun 24, 2021 · a81ac60 · a81ac60
2 parents e49387f + 4bd1388
commit a81ac60
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 2 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,13 @@
+**24/06/2021** [Version 2.4.4]
+
+ - Add generic 'Core' location
+ - Update Flask-moment dependency
+
+*Update notes*:
+
+- In case of issues with the rendering of dates or exceptions related to `moment` or `Flask-moment`,
+re-run `pip install -r requirements.txt` over the activated Portal virtualenv.
+
 **08/06/2021** [Version 2.4.3]
 
  - Add 'None' as selectable scenario

diff --git a/app/network_services/routes.py b/app/network_services/routes.py
@@ -32,6 +32,9 @@ def create():
     if error is not None:
         flash(error, 'error')
 
+    if 'Core' not in locations:
+        locations.insert(0, 'Core')
+
     return render_template('network_services/create.html', title='New Network Service', form=form, locations=locations,
                            ewEnabled=Config().EastWest.Enabled)
 

diff --git a/app/templates/base.html b/app/templates/base.html
@@ -6,7 +6,6 @@
 
 {% block scripts %}
     {{ super() }}
-    {{ moment.include_jquery() }}
     {{ moment.include_moment() }}
     <script src="{{ url_for('static', filename='js/nanobar.min.js') }}"></script>
     <script>

diff --git a/requirements.txt b/requirements.txt
@@ -3,7 +3,7 @@ Flask-Bootstrap>=3.3.7.1
 Flask-Login>=0.4.1
 Flask-Mail>=0.9.1
 Flask-Migrate>=2.4.0
-Flask-Moment>=0.7.0
+Flask-Moment>=1.0.1
 Flask-SQLAlchemy>=2.3.2
 Flask-WTF>=0.14.2
 PyJWT>=1.7.1