From e20240b878fa18d80a5ba73067083348eaad8c4b Mon Sep 17 00:00:00 2001 From: Montana Date: Tue, 19 Feb 2019 11:34:00 -0500 Subject: [PATCH] Pass task order to TOEditLink macro --- templates/components/to_edit_link.html | 4 ++-- templates/portfolios/task_orders/review.html | 6 +++--- templates/task_orders/new/review.html | 9 ++++----- 3 files changed, 9 insertions(+), 10 deletions(-) diff --git a/templates/components/to_edit_link.html b/templates/components/to_edit_link.html index d4918eee..65737e24 100644 --- a/templates/components/to_edit_link.html +++ b/templates/components/to_edit_link.html @@ -1,8 +1,8 @@ {% from "components/edit_link.html" import EditLink %} -{% macro TOEditLink(screen=1, anchor=None) %} +{% macro TOEditLink(task_order=None, screen=1, anchor=None) %} {% if task_order %} - {{ EditLink(url_for("task_orders.new", screen=screen, task_order_id=task_order.id, _anchor=anchor)) }} + {{ EditLink(url_for("task_orders.new", screen=screen, task_order_id=task_order.id, _anchor=anchor)) }} {% else %} {{ EditLink(url_for("task_orders.new", screen=screen, _anchor=anchor)) }} {% endif %} diff --git a/templates/portfolios/task_orders/review.html b/templates/portfolios/task_orders/review.html index 657e7976..28bd8322 100644 --- a/templates/portfolios/task_orders/review.html +++ b/templates/portfolios/task_orders/review.html @@ -50,14 +50,14 @@
{{ "task_orders.new.review.reporting"| translate }} - {{ TOEditLink(screen=1, anchor="reporting") }} + {{ TOEditLink(task_order=task_order, screen=1, anchor="reporting") }}
{% include "fragments/task_order_review/reporting.html" %}
{{ "task_orders.new.review.funding"| translate }} - {{ TOEditLink(screen=2) }} + {{ TOEditLink(task_order=task_order, screen=2) }}
{% include "fragments/task_order_review/funding.html" %} @@ -69,7 +69,7 @@
{{ "task_orders.new.review.oversight"| translate }} - {{ TOEditLink(screen=3) }} + {{ TOEditLink(task_order=task_order, screen=3) }}
{% include "fragments/task_order_review/oversight.html" %}
diff --git a/templates/task_orders/new/review.html b/templates/task_orders/new/review.html index eaec89b4..e075c6af 100644 --- a/templates/task_orders/new/review.html +++ b/templates/task_orders/new/review.html @@ -11,12 +11,11 @@ {% block form %} - -

{{ "task_orders.new.review.app_info"| translate }} {{ TOEditLink(screen=1) }}

+

{{ "task_orders.new.review.app_info"| translate }} {{ TOEditLink(task_order=task_order, screen=1) }}

{% include "fragments/task_order_review/app_info.html" %}
-

{{ "task_orders.new.review.reporting"| translate }} {{ TOEditLink(screen=1, anchor="reporting") }}

+

{{ "task_orders.new.review.reporting"| translate }} {{ TOEditLink(task_order=task_order, screen=1, anchor="reporting") }}

{{ @@ -84,11 +83,11 @@
-

{{ "task_orders.new.review.funding"| translate }} {{ TOEditLink(screen=2) }}

+

{{ "task_orders.new.review.funding"| translate }} {{ TOEditLink(task_order=task_order, screen=2) }}

{% include "fragments/task_order_review/funding.html" %}
-

{{ "task_orders.new.review.oversight"| translate }} {{ TOEditLink(screen=3) }}

+

{{ "task_orders.new.review.oversight"| translate }} {{ TOEditLink(task_order=task_order, screen=3) }}

{% include "fragments/task_order_review/oversight.html" %} {% endblock %}