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

Clean up routes

Browse Source
This commit is contained in:
Montana 2019-01-28 11:12:11 -05:00
parent 1ca4d62a3a
commit b91d869bbe
3 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
atst/routes/portfolios/task_orders.py
View File

@ -71,9 +71,10 @@ def view_task_order(portfolio_id, task_order_id):
@portfolios_bp.route("/portfolios/<portfolio_id>/task_order/<task_order_id>/review") @portfolios_bp.route("/portfolios/<portfolio_id>/task_order/<task_order_id>/review")
def review_task_order(portfolio_id, task_order_id, form=None): def ko_review(portfolio_id, task_order_id, form=None):
portfolio = Portfolios.get(g.current_user, portfolio_id)
task_order = TaskOrders.get(g.current_user, task_order_id) task_order = TaskOrders.get(g.current_user, task_order_id)
# get permission: make sure g.current_user is task_order.contracting_officer
portfolio = Portfolios.get(g.current_user, portfolio_id)
return render_template( return render_template(
"/portfolios/task_orders/review.html", "/portfolios/task_orders/review.html",
portfolio=portfolio, portfolio=portfolio,
@ -86,14 +87,16 @@ def review_task_order(portfolio_id, task_order_id, form=None):
"/portfolios/<portfolio_id>/task_order/<task_order_id>/submit_review", "/portfolios/<portfolio_id>/task_order/<task_order_id>/submit_review",
methods=["POST"], methods=["POST"],
) )
def submit_review_task_order(portfolio_id, task_order_id, form=None): def submit_ko_review(portfolio_id, task_order_id, form=None):
portfolio = Portfolios.get(g.current_user, portfolio_id)
task_order = TaskOrders.get(g.current_user, task_order_id) task_order = TaskOrders.get(g.current_user, task_order_id)
form = KOReviewForm(http_request.form) form = KOReviewForm(http_request.form)
portfolio = Portfolios.get(g.current_user, portfolio_id)
if form.validate(): if form.validate():
# add form data to TO data
return redirect(url_for("task_orders.view_task_order")) return redirect(url_for("task_orders.view_task_order"))
else: else:
# stay on the page and fix the fields that didnt validate
return review(portfolio.id, task_order.id) return review(portfolio.id, task_order.id)

4
templates/portfolios/task_orders/review.html
View File

@ -15,9 +15,7 @@
{% block form_action %} {% block form_action %}
{% if task_order_id %} {% if task_order_id %}
<form method='POST' action="{{ url_for('portfolios.submit_review_task_order', portfolio_id=portfolio_id, task_order_id=task_order_id, form=form) }}" autocomplete="off" enctype="multipart/form-data"> <form method='POST' action="{{ url_for('portfolios.submit_ko_review', portfolio_id=portfolio_id, task_order_id=task_order_id, form=form) }}" autocomplete="off" enctype="multipart/form-data">
{% else %}
<form method='GET' action="{{ url_for('portfolios.view_task_order', portfolio_id=portfolio_id, task_order_id=task_order_id) }}" autocomplete="off" enctype="multipart/form-data">
{% endif %} {% endif %}
{% endblock %} {% endblock %}

2
templates/portfolios/task_orders/show.html
View File

@ -93,7 +93,7 @@
complete=all_sections_complete) %} complete=all_sections_complete) %}
<div class="task-order-next-steps__action col"> <div class="task-order-next-steps__action col">
<a <a
href="{{ url_for("portfolios.review_task_order", portfolio_id=portfolio.id, task_order_id=task_order.id) }}" href="{{ url_for("portfolios.ko_review", portfolio_id=portfolio.id, task_order_id=task_order.id) }}"
class="usa-button usa-button-primary"> class="usa-button usa-button-primary">
Edit Edit
</a> </a>