diff --git a/atst/routes/portfolios/__init__.py b/atst/routes/portfolios/__init__.py index 392ab2fe..4a72cfb4 100644 --- a/atst/routes/portfolios/__init__.py +++ b/atst/routes/portfolios/__init__.py @@ -14,16 +14,6 @@ from atst.models.permissions import Permissions from atst.utils.localization import translate -def get_breadcrumb_from_request(request): - if request.url_rule.rule.startswith("/portfolios//task_order"): - return translate("navigation.portfolio_navigation.breadcrumbs.funding") - if request.url_rule.endpoint == "portfolios.portfolio": - return translate("navigation.portfolio_navigation.breadcrumbs.admin") - if request.url_rule.endpoint == "portfolios.portfolio_reports": - return translate("navigation.portfolio_navigation.breadcrumbs.reports") - return None - - @portfolios_bp.context_processor def portfolio(): portfolio = None @@ -42,9 +32,4 @@ def portfolio(): ) return False - return { - "portfolio": portfolio, - "permissions": Permissions, - "user_can": user_can, - "secondary_breadcrumb": get_breadcrumb_from_request(http_request), - } + return {"portfolio": portfolio, "permissions": Permissions, "user_can": user_can} diff --git a/templates/portfolios/activity/index.html b/templates/portfolios/activity/index.html index d3a3acf9..c28b766c 100644 --- a/templates/portfolios/activity/index.html +++ b/templates/portfolios/activity/index.html @@ -1,6 +1,8 @@ {% extends "portfolios/base.html" %} {% from "components/pagination.html" import Pagination %} +{% set secondary_breadcrumb = "navigation.portfolio_navigation.breadcrumbs.admin" | translate %} + {% block portfolio_content %}
{% include "fragments/audit_events_log.html" %} diff --git a/templates/portfolios/applications/index.html b/templates/portfolios/applications/index.html index 60e56996..06eac461 100644 --- a/templates/portfolios/applications/index.html +++ b/templates/portfolios/applications/index.html @@ -3,7 +3,6 @@ {% extends "portfolios/base.html" %} - {% block portfolio_content %} {% if not portfolio.applications %} diff --git a/templates/portfolios/edit.html b/templates/portfolios/edit.html index e6e68f16..f61c7d8c 100644 --- a/templates/portfolios/edit.html +++ b/templates/portfolios/edit.html @@ -3,6 +3,8 @@ {% from "components/icon.html" import Icon %} {% from "components/text_input.html" import TextInput %} +{% set secondary_breadcrumb = "navigation.portfolio_navigation.breadcrumbs.admin" | translate %} + {% block portfolio_content %} {% include "fragments/flash.html" %} diff --git a/templates/portfolios/reports/index.html b/templates/portfolios/reports/index.html index 01aa3607..9a455ddc 100644 --- a/templates/portfolios/reports/index.html +++ b/templates/portfolios/reports/index.html @@ -4,6 +4,8 @@ {% from "components/icon.html" import Icon %} {% from "components/empty_state.html" import EmptyState %} +{% set secondary_breadcrumb = "navigation.portfolio_navigation.breadcrumbs.reports" | translate %} + {% block portfolio_content %} {{ Alert("Budget Report for Portfolio " + portfolio.name, diff --git a/templates/portfolios/task_orders/index.html b/templates/portfolios/task_orders/index.html index 18653ab1..b7a18fd9 100644 --- a/templates/portfolios/task_orders/index.html +++ b/templates/portfolios/task_orders/index.html @@ -3,6 +3,8 @@ {% extends "portfolios/base.html" %} +{% set secondary_breadcrumb = "navigation.portfolio_navigation.breadcrumbs.funding" | translate %} + {% block portfolio_content %} {% macro ViewLink(task_order) %} diff --git a/templates/portfolios/task_orders/invitations.html b/templates/portfolios/task_orders/invitations.html index 782f86b8..14a3d389 100644 --- a/templates/portfolios/task_orders/invitations.html +++ b/templates/portfolios/task_orders/invitations.html @@ -1,5 +1,7 @@ {% extends "portfolios/base.html" %} +{% set secondary_breadcrumb = "navigation.portfolio_navigation.breadcrumbs.funding" | translate %} + {% from "components/checkbox_input.html" import CheckboxInput %} {% from "components/icon.html" import Icon %} {% from "components/text_input.html" import TextInput %} diff --git a/templates/portfolios/task_orders/review.html b/templates/portfolios/task_orders/review.html index 854da35b..61b50e8c 100644 --- a/templates/portfolios/task_orders/review.html +++ b/templates/portfolios/task_orders/review.html @@ -1,5 +1,7 @@ {% extends "base.html" %} +{% set secondary_breadcrumb = "navigation.portfolio_navigation.breadcrumbs.funding" | translate %} + {% from "components/edit_link.html" import EditLink %} {% from "components/required_label.html" import RequiredLabel %} {% from "components/icon.html" import Icon %} diff --git a/templates/portfolios/task_orders/show.html b/templates/portfolios/task_orders/show.html index 04e49824..310be45c 100644 --- a/templates/portfolios/task_orders/show.html +++ b/templates/portfolios/task_orders/show.html @@ -1,5 +1,7 @@ {% extends "portfolios/base.html" %} +{% set secondary_breadcrumb = "navigation.portfolio_navigation.breadcrumbs.funding" | translate %} + {% from "components/icon.html" import Icon %} {% block portfolio_content %}