Move getting list of portfolios to app-wide context processor

This commit is contained in:
Patrick Smith 2019-02-06 11:26:17 -05:00
parent 0bf31c6c13
commit 53f36e827f
2 changed files with 10 additions and 7 deletions

View File

@ -22,6 +22,7 @@ from atst.domain.authnid.crl import CRLCache, NoOpCRLCache
from atst.domain.auth import apply_authentication from atst.domain.auth import apply_authentication
from atst.domain.authz import Authorization from atst.domain.authz import Authorization
from atst.domain.csp import make_csp_provider from atst.domain.csp import make_csp_provider
from atst.domain.portfolios import Portfolios
from atst.models.permissions import Permissions from atst.models.permissions import Permissions
from atst.eda_client import MockEDAClient from atst.eda_client import MockEDAClient
from atst.utils import mailer from atst.utils import mailer
@ -90,6 +91,14 @@ def make_flask_callbacks(app):
g.Authorization = Authorization g.Authorization = Authorization
g.Permissions = Permissions 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 @app.after_request
def _cleanup(response): def _cleanup(response):
g.current_user = None g.current_user = None

View File

@ -15,7 +15,6 @@ from atst.models.permissions import Permissions
@portfolios_bp.context_processor @portfolios_bp.context_processor
def portfolio(): def portfolio():
portfolios = Portfolios.for_user(g.current_user)
portfolio = None portfolio = None
if "portfolio_id" in http_request.view_args: if "portfolio_id" in http_request.view_args:
try: try:
@ -32,9 +31,4 @@ def portfolio():
) )
return False return False
return { return {"portfolio": portfolio, "permissions": Permissions, "user_can": user_can}
"portfolio": portfolio,
"portfolios": portfolios,
"permissions": Permissions,
"user_can": user_can,
}