Merge branch 'main' into fix-rolebased-ui-rendenring

FlexMeasures · Oct 27, 2024 · 8f1a1d4 · 8f1a1d4
2 parents fb7c970 + 8914e47
commit 8f1a1d4
Show file tree

Hide file tree

Showing 5 changed files with 9 additions and 12 deletions.
diff --git a/flexmeasures/ui/__init__.py b/flexmeasures/ui/__init__.py
@@ -118,10 +118,11 @@ def basic_admin_auth():
         return
 
     # Logged-in users can view queues on the demo server, but only admins can view them on other servers
-    if app.config.get("FLEXMEASURES_MODE", "") == "demo":
-        rq_dashboard.blueprint.before_request(basic_auth)
-    else:
-        rq_dashboard.blueprint.before_request(basic_admin_auth)
+    if app.config.get("FLEXMEASURES_ENV") != "documentation":
+        if app.config.get("FLEXMEASURES_MODE", "") == "demo":
+            rq_dashboard.blueprint.before_request(basic_auth)
+        else:
+            rq_dashboard.blueprint.before_request(basic_admin_auth)
 
     # To set template variables, use set_global_template_variables in app.py
     app.register_blueprint(rq_dashboard.blueprint, url_prefix="/tasks")

diff --git a/requirements/3.10/docs.txt b/requirements/3.10/docs.txt
@@ -55,7 +55,7 @@ six==1.16.0
     #   sphinxcontrib-httpdomain
 snowballstemmer==2.2.0
     # via sphinx
-sphinx==7.4.7
+sphinx==7.3.7
     # via
     #   -r requirements/docs.in
     #   sphinx-copybutton
@@ -88,8 +88,6 @@ sphinxcontrib-qthelp==2.0.0
     # via sphinx
 sphinxcontrib-serializinghtml==2.0.0
     # via sphinx
-tomli==2.0.1
-    # via sphinx
 urllib3==2.2.3
     # via
     #   -c requirements/3.10/app.txt

diff --git a/requirements/3.11/docs.txt b/requirements/3.11/docs.txt
@@ -55,7 +55,7 @@ six==1.16.0
     #   sphinxcontrib-httpdomain
 snowballstemmer==2.2.0
     # via sphinx
-sphinx==7.4.7
+sphinx==7.3.7
     # via
     #   -r requirements/docs.in
     #   sphinx-copybutton

diff --git a/requirements/3.9/docs.txt b/requirements/3.9/docs.txt
@@ -59,7 +59,7 @@ six==1.16.0
     #   sphinxcontrib-httpdomain
 snowballstemmer==2.2.0
     # via sphinx
-sphinx==7.4.7
+sphinx==7.3.7
     # via
     #   -r requirements/docs.in
     #   sphinx-copybutton
@@ -92,8 +92,6 @@ sphinxcontrib-qthelp==2.0.0
     # via sphinx
 sphinxcontrib-serializinghtml==2.0.0
     # via sphinx
-tomli==2.0.1
-    # via sphinx
 urllib3==2.2.3
     # via
     #   -c requirements/3.9/app.txt

diff --git a/requirements/docs.in b/requirements/docs.in
@@ -1,4 +1,4 @@
-sphinx
+sphinx!=7.4.*
 sphinx-rtd-theme >= 1.2
 sphinxcontrib.httpdomain
 sphinx_fontawesome