diff --git a/atst/routes/task_orders/index.py b/atst/routes/task_orders/index.py index e02780ca..5302cf88 100644 --- a/atst/routes/task_orders/index.py +++ b/atst/routes/task_orders/index.py @@ -8,9 +8,9 @@ from atst.forms.task_order import SignatureForm from atst.models import Permissions -@task_orders_bp.route("/task_orders//review") +@task_orders_bp.route("/task_orders/") @user_can(Permissions.VIEW_TASK_ORDER_DETAILS, message="review task order details") -def review_task_order(task_order_id): +def view_task_order(task_order_id): task_order = TaskOrders.get(task_order_id) if task_order.is_draft: return redirect(url_for("task_orders.edit", task_order_id=task_order.id)) diff --git a/templates/portfolios/header.html b/templates/portfolios/header.html index 63684d92..71d9a550 100644 --- a/templates/portfolios/header.html +++ b/templates/portfolios/header.html @@ -30,7 +30,7 @@ icon='funding', text='navigation.portfolio_navigation.breadcrumbs.funding' | translate, url=url_for("task_orders.portfolio_funding", portfolio_id=portfolio.id), - active=request.url_rule.endpoint in ["task_orders.portfolio_funding", "task_orders.review_task_order", "task_orders.form_step_one_add_pdf", "task_orders.submit_form_step_one_add_pdf", "task_orders.form_step_two_add_number", "task_orders.submit_form_step_two_add_number", "task_orders.form_step_three_add_clins", "task_orders.submit_form_step_three_add_clins", "task_orders.form_step_four_review", "task_orders.form_step_five_confirm_signature"], + active=request.url_rule.endpoint in ["task_orders.portfolio_funding", "task_orders.view_task_order", "task_orders.form_step_one_add_pdf", "task_orders.submit_form_step_one_add_pdf", "task_orders.form_step_two_add_number", "task_orders.submit_form_step_two_add_number", "task_orders.form_step_three_add_clins", "task_orders.submit_form_step_three_add_clins", "task_orders.form_step_four_review", "task_orders.form_step_five_confirm_signature"], ) }} {% endif %} {{ Link( diff --git a/templates/portfolios/reports/expired_task_orders.html b/templates/portfolios/reports/expired_task_orders.html index a7acdc5e..dcde6683 100644 --- a/templates/portfolios/reports/expired_task_orders.html +++ b/templates/portfolios/reports/expired_task_orders.html @@ -23,7 +23,7 @@ {% for task_order in expired_task_orders %} - Task Order + Task Order {{ task_order.number }} {{ Icon("caret_right", classes="icon--tiny icon--blue" ) }} diff --git a/templates/portfolios/reports/obligated_funds.html b/templates/portfolios/reports/obligated_funds.html index 43046472..e0f11792 100644 --- a/templates/portfolios/reports/obligated_funds.html +++ b/templates/portfolios/reports/obligated_funds.html @@ -67,7 +67,7 @@ Active Task Orders {% for task_order in portfolio.active_task_orders %} - + {{ task_order.number }} {{ Icon("caret_right", classes="icon--tiny icon--blue" ) }} {% endfor %} diff --git a/templates/task_orders/fragments/task_order_review.html b/templates/task_orders/fragments/task_order_view.html similarity index 100% rename from templates/task_orders/fragments/task_order_review.html rename to templates/task_orders/fragments/task_order_view.html diff --git a/templates/task_orders/index.html b/templates/task_orders/index.html index 160fb483..5926ff60 100644 --- a/templates/task_orders/index.html +++ b/templates/task_orders/index.html @@ -26,7 +26,7 @@ {% endif %} {% endset %}
-

{{ to_number }} {{ Icon("caret_right", classes="icon--tiny icon--primary" ) }}

+

{{ to_number }} {{ Icon("caret_right", classes="icon--tiny icon--primary" ) }}

{% if status != 'Expired' -%}
diff --git a/templates/task_orders/review.html b/templates/task_orders/review.html index 39fd8128..e6aa8510 100644 --- a/templates/task_orders/review.html +++ b/templates/task_orders/review.html @@ -11,6 +11,6 @@ {% endcall %}
- {% include "task_orders/fragments/task_order_review.html" %} + {% include "task_orders/fragments/task_order_view.html" %}
{% endblock %} diff --git a/templates/task_orders/step_4.html b/templates/task_orders/step_4.html index 86006054..c76c0c73 100644 --- a/templates/task_orders/step_4.html +++ b/templates/task_orders/step_4.html @@ -13,5 +13,5 @@ {% endblock %} {% block to_builder_form_field %} - {% include "task_orders/fragments/task_order_review.html" %} + {% include "task_orders/fragments/task_order_view.html" %} {% endblock %} diff --git a/tests/routes/task_orders/test_index.py b/tests/routes/task_orders/test_index.py index 48d8bd6b..e9b81f7a 100644 --- a/tests/routes/task_orders/test_index.py +++ b/tests/routes/task_orders/test_index.py @@ -35,22 +35,22 @@ def task_order(): return task_order -def test_review_task_order_not_draft(client, user_session, task_order): +def test_view_task_order_not_draft(client, user_session, task_order): TaskOrders.sign(task_order=task_order, signer_dod_id=random_dod_id()) user_session(task_order.portfolio.owner) response = client.get( - url_for("task_orders.review_task_order", task_order_id=task_order.id) + url_for("task_orders.view_task_order", task_order_id=task_order.id) ) assert response.status_code == 200 -def test_review_task_order_draft(client, user_session, task_order): +def test_view_task_order_draft(client, user_session, task_order): TaskOrders.update( task_order_id=task_order.id, number="1234567890", clins=[], pdf=None ) user_session(task_order.portfolio.owner) response = client.get( - url_for("task_orders.review_task_order", task_order_id=task_order.id) + url_for("task_orders.view_task_order", task_order_id=task_order.id) ) assert response.status_code == 302 assert url_for("task_orders.edit", task_order_id=task_order.id) in response.location