From 8621f2054bc3c1297ea887ff7f35d447bb7ca97b Mon Sep 17 00:00:00 2001 From: Montana Date: Wed, 27 Feb 2019 09:53:06 -0500 Subject: [PATCH] Use defense_component property on TO model when appropriate --- templates/fragments/task_order_review/app_info.html | 2 +- tests/routes/task_orders/test_new_task_order.py | 3 +-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/templates/fragments/task_order_review/app_info.html b/templates/fragments/task_order_review/app_info.html index d124da38..93db4525 100644 --- a/templates/fragments/task_order_review/app_info.html +++ b/templates/fragments/task_order_review/app_info.html @@ -2,7 +2,7 @@
{{ ReviewField(("task_orders.new.review.portfolio" | translate), task_order.portfolio_name) }} - {{ ReviewField(("task_orders.new.review.dod" | translate), task_order.portfolio.defense_component, filter="normalizeOrder") }} + {{ ReviewField(("task_orders.new.review.dod" | translate), task_order.defense_component, filter="normalizeOrder") }}
{{ ReviewField(("task_orders.new.review.scope" | translate), task_order.scope) }} diff --git a/tests/routes/task_orders/test_new_task_order.py b/tests/routes/task_orders/test_new_task_order.py index d1e9f433..a6908a21 100644 --- a/tests/routes/task_orders/test_new_task_order.py +++ b/tests/routes/task_orders/test_new_task_order.py @@ -209,8 +209,7 @@ def test_show_task_order_form(task_order): task_order.creator, task_order_id=task_order.id ) assert ( - another_workflow.form.data["defense_component"] - == task_order.portfolio.defense_component + another_workflow.form.data["defense_component"] == task_order.defense_component )