Merge branch 'master' into Develop

# Conflicts: # cps/web.py
2021-12-04 20:56:04 +01:00
parent 1e9d88fa98 3bf173d958
commit cd5711e651
62 changed files with 3821 additions and 3690 deletions
--- a/cps/ub.py
+++ b/cps/ub.py
@@ -306,11 +306,11 @@ class Anonymous(AnonymousUserMixin, UserBase):
        return None

    def set_view_property(self, page, prop, value):
-        if 'view' in flask_session:
-            if not flask_session['view'].get(page):
-                flask_session['view'][page] = dict()
-            flask_session['view'][page][prop] = value
-        return None
+        if not 'view' in flask_session:
+            flask_session['view'] = dict()
+        if not flask_session['view'].get(page):
+            flask_session['view'][page] = dict()
+        flask_session['view'][page][prop] = value

 class User_Sessions(Base):
    __tablename__ = 'user_session'