From a3b3525b7879e3ba7efcc06a9bdc9065fccf0be5 Mon Sep 17 00:00:00 2001 From: rubenwardy Date: Sat, 19 Sep 2020 19:30:33 +0100 Subject: [PATCH] Add work queue icon to navigation bar --- app/flatpages/help/ranks_permissions.md | 2 +- app/template_filters.py | 12 ++++++- app/templates/base.html | 46 ++++++++++++++++++------- 3 files changed, 46 insertions(+), 14 deletions(-) diff --git a/app/flatpages/help/ranks_permissions.md b/app/flatpages/help/ranks_permissions.md index b03a7cd..1e1b8ef 100644 --- a/app/flatpages/help/ranks_permissions.md +++ b/app/flatpages/help/ranks_permissions.md @@ -163,7 +163,7 @@ title: Ranks and Permissions Approve Release - + ✓ ✓ diff --git a/app/template_filters.py b/app/template_filters.py index 574c1b1..39d3806 100644 --- a/app/template_filters.py +++ b/app/template_filters.py @@ -1,6 +1,7 @@ from . import app -from .models import Permission +from .models import Permission, Package, PackageState, PackageRelease from .utils import abs_url_for, url_set_query +from flask_user import current_user from urllib.parse import urlparse @app.context_processor @@ -12,6 +13,15 @@ def inject_functions(): check_global_perm = Permission.checkPerm return dict(abs_url_for=abs_url_for, url_set_query=url_set_query, check_global_perm=check_global_perm) +@app.context_processor +def inject_todo(): + todo_list_count = None + if current_user.is_authenticated and current_user.canAccessTodoList(): + todo_list_count = Package.query.filter_by(state=PackageState.READY_FOR_REVIEW).count() + todo_list_count += PackageRelease.query.filter_by(approved=False, task_id=None).count() + + return dict(todo_list_count=todo_list_count) + @app.template_filter() def throw(err): raise Exception(err) diff --git a/app/templates/base.html b/app/templates/base.html index 239cbe4..fabe2f6 100644 --- a/app/templates/base.html +++ b/app/templates/base.html @@ -60,17 +60,39 @@