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

fix routes

Browse Source
This commit is contained in:
Montana 2019-01-28 15:29:19 -05:00
parent b91d869bbe
commit 75bfc5fbdb
2 changed files with 22 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -84,20 +84,36 @@ def ko_review(portfolio_id, task_order_id, form=None):
@portfolios_bp.route( @portfolios_bp.route(
"/portfolios/<portfolio_id>/task_order/<task_order_id>/submit_review", "/portfolios/<portfolio_id>/task_order/<task_order_id>/review", methods=["POST"]
methods=["POST"],
) )
def submit_ko_review(portfolio_id, task_order_id, form=None): def submit_ko_review(portfolio_id, task_order_id, form=None):
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) portfolio = Portfolios.get(g.current_user, portfolio_id)
# import ipdb
# ipdb.set_trace()
if form.validate(): if form.validate():
form_data = {**http_request.form, **http_request.files}
# add form data to TO data # add form data to TO data
return redirect(url_for("task_orders.view_task_order")) import ipdb; ipdb.set_trace()
return redirect(
url_for(
"portfolios.view_task_order",
portfolio_id=portfolio_id,
task_order_id=task_order_id,
form=form,
)
)
else: else:
# stay on the page and fix the fields that didnt validate # stay on the page and fix the fields that didnt validate
return review(portfolio.id, task_order.id) return render_template(
"/portfolios/task_orders/review.html",
portfolio=portfolio,
task_order=task_order,
form=form,
)
@portfolios_bp.route( @portfolios_bp.route(

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

@ -13,11 +13,8 @@
{% include "fragments/flash.html" %} {% include "fragments/flash.html" %}
{% block form_action %} <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">
{% if task_order_id %} {{ form.csrf_token }}
<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">
{% endif %}
{% endblock %}
{% block form %} {% block form %}