diff --git a/atst/app.py b/atst/app.py index 7d5cc0c6..afaeb6fd 100644 --- a/atst/app.py +++ b/atst/app.py @@ -22,6 +22,7 @@ from atst.domain.authnid.crl import CRLCache, NoOpCRLCache from atst.domain.auth import apply_authentication from atst.domain.authz import Authorization from atst.domain.csp import make_csp_provider +from atst.domain.portfolios import Portfolios from atst.models.permissions import Permissions from atst.eda_client import MockEDAClient from atst.utils import mailer @@ -90,6 +91,14 @@ def make_flask_callbacks(app): g.Authorization = Authorization g.Permissions = Permissions + @app.context_processor + def _portfolios(): + if not g.current_user: + return {} + + portfolios = Portfolios.for_user(g.current_user) + return {"portfolios": portfolios} + @app.after_request def _cleanup(response): g.current_user = None diff --git a/atst/routes/portfolios/__init__.py b/atst/routes/portfolios/__init__.py index c35d3899..ad935378 100644 --- a/atst/routes/portfolios/__init__.py +++ b/atst/routes/portfolios/__init__.py @@ -15,7 +15,6 @@ from atst.models.permissions import Permissions @portfolios_bp.context_processor def portfolio(): - portfolios = Portfolios.for_user(g.current_user) portfolio = None if "portfolio_id" in http_request.view_args: try: @@ -32,9 +31,4 @@ def portfolio(): ) return False - return { - "portfolio": portfolio, - "portfolios": portfolios, - "permissions": Permissions, - "user_can": user_can, - } + return {"portfolio": portfolio, "permissions": Permissions, "user_can": user_can}