pk/atst
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Rename review route and template to view because it better reflects the purpose of the route and template

Browse Source
This commit is contained in:
leigh-mil 2019-12-19 14:28:00 -05:00
parent 2f7a974955
commit cbcac2b142
9 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
atst/routes/task_orders/index.py
View File

@ -8,9 +8,9 @@ from atst.forms.task_order import SignatureForm
from atst.models import Permissions
@task_orders_bp.route("/task_orders/<task_order_id>/review")
@task_orders_bp.route("/task_orders/<task_order_id>")
@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))

2
templates/portfolios/header.html
View File

@ -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(

2
templates/portfolios/reports/expired_task_orders.html
View File

@ -23,7 +23,7 @@
{% for task_order in expired_task_orders %}
<tr>
<td colspan="5">
<span class="h4 reporting-expended-funding__header">Task Order</span> <a href="{{ url_for("task_orders.review_task_order", task_order_id=task_order.id) }}">
<span class="h4 reporting-expended-funding__header">Task Order</span> <a href="{{ url_for("task_orders.view_task_order", task_order_id=task_order.id) }}">
{{ task_order.number }} {{ Icon("caret_right", classes="icon--tiny icon--blue" ) }}
</a>
</td>

2
templates/portfolios/reports/obligated_funds.html
View File

@ -67,7 +67,7 @@
Active Task Orders
</h3>
{% for task_order in portfolio.active_task_orders %}
<a href="{{ url_for("task_orders.review_task_order", task_order_id=task_order.id) }}">
<a href="{{ url_for("task_orders.view_task_order", task_order_id=task_order.id) }}">
{{ task_order.number }} {{ Icon("caret_right", classes="icon--tiny icon--blue" ) }}
</a>
{% endfor %}

0
templates/task_orders/fragments/task_order_review.html → templates/task_orders/fragments/task_order_view.html
View File

2
templates/task_orders/index.html
View File

@ -26,7 +26,7 @@
{% endif %}
{% endset %}
<div class="accordion__content--list-item">
<h4><a href="{{ url_for('task_orders.review_task_order', task_order_id=task_order.id) }}">{{ to_number }} {{ Icon("caret_right", classes="icon--tiny icon--primary" ) }}</a></h4>
<h4><a href="{{ url_for('task_orders.view_task_order', task_order_id=task_order.id) }}">{{ to_number }} {{ Icon("caret_right", classes="icon--tiny icon--primary" ) }}</a></h4>
{% if status != 'Expired' -%}
<div class="row">
<div class="col col--grow">

2
templates/task_orders/review.html
View File

@ -11,6 +11,6 @@
{% endcall %}
<div class="task-order">
{% include "task_orders/fragments/task_order_review.html" %}
{% include "task_orders/fragments/task_order_view.html" %}
</div>
{% endblock %}

2
templates/task_orders/step_4.html
View File

@ -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 %}

8
tests/routes/task_orders/test_index.py
View File

@ -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