Added Jinja macros

advlabdb/__init__.py

@@ -45,3 +45,4 @@ except Exception as ex:
     print(
         "\nYou are probably initializing the database with a script. If not, then you have to worry about not being able to import in __init__.py!\n"
     )
+    print(str(ex))

advlabdb/modelViews.py

@@ -38,6 +38,8 @@ from advlabdb.exceptions import ModelViewException
 
 
 class UserView(SecureModelView):
+    can_view_details = True
+
     column_list = ["email", "active", "roles", "assistant", "active_semester"]
     column_searchable_list = ["email"]
     column_filters = ["active", "active_semester", "assistant"]

advlabdb/routes.py

@@ -7,7 +7,7 @@ from advlabdb.utils import setUserActiveSemester, userActiveSemester
 
 @app.context_processor
 def util_processor():
-    return dict(userActiveSemester=userActiveSemester)
+    return dict(userActiveSemester=userActiveSemester, current_user=current_user)
 
 
 @app.route("/")

advlabdb/templates/admin_create.html

@@ -1,6 +1,7 @@
+{% from "macros.html" import information %}
 {% extends "admin/model/create.html" %}
 
 {% block body %}
-User's active semester: {{userActiveSemester().repr()}}
+{{ information(current_user, userActiveSemester, role="admin") }}
 {{super()}}
 {% endblock %}

advlabdb/templates/admin_edit.html

@@ -1,6 +1,7 @@
+{% from "macros.html" import information %}
 {% extends "admin/model/edit.html" %}
 
 {% block body %}
-User's active semester: {{userActiveSemester().repr()}}
+{{ information(current_user, userActiveSemester, role="admin") }}
 {{super()}}
 {% endblock %}

advlabdb/templates/admin_index.html

@@ -1,7 +1,8 @@
+{% from "macros.html" import information %}
 {% extends "admin/index.html" %}
 
 {% block body %}
-User's active semester: {{userActiveSemester(flashWarning=True).repr()}}
+{{ information(current_user, userActiveSemester, role="admin") }}
 <h3>Welcome back, commander!</h3>
 {{super()}}
 {% endblock %}

advlabdb/templates/admin_list.html

@@ -1,6 +1,7 @@
+{% from "macros.html" import information %}
 {% extends "admin/model/list.html" %}
 
 {% block body %}
-User's active semester: {{userActiveSemester(flashWarning=True).repr()}}
+{{ information(current_user, userActiveSemester, role="admin") }}
 {{super()}}
 {% endblock %}

advlabdb/templates/macros.html

@@ -0,0 +1,4 @@
+{% macro information(current_user, userActiveSemester, role) %}
+User: <a href="{{url_for('index')}}{{role}}/user/details/?id={{current_user.id}}">{{current_user.repr()}}</a>; Active
+semester: {{userActiveSemester(flashWarning=True).repr()}}.
+{% endmacro %}