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

Backend handling for task order upload

Browse Source 
- Move task_orders.edit rendering to function
- Construct task_orders.update form route correctly in template
This commit is contained in:
dandds
2019-06-06 09:13:48 -04:00
parent fb430e76e9
commit b0f47bc3ff
3 changed files with 72 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
atst/routes/task_orders/new.py
View File

@@ -8,25 +8,32 @@ from atst.models.permissions import Permissions
from atst.utils.flash import formatted_flash as flash
@task_orders_bp.route("/portfolios/<portfolio_id>/task_orders/new")
@task_orders_bp.route("/portfolios/<portfolio_id>/task_orders/<task_order_id>/edit")
@user_can(Permissions.CREATE_TASK_ORDER, message="view new task order form")
def edit(portfolio_id, task_order_id=None):
form = None
def render_task_orders_edit(portfolio_id, task_order_id=None):
render_args = {}
if task_order_id:
task_order = TaskOrders.get(task_order_id)
form = TaskOrderForm(number=task_order.number)
render_args["form"] = TaskOrderForm(
number=task_order.number, pdf=task_order.pdf
)
render_args["task_order_id"] = task_order_id
else:
form = TaskOrderForm()
render_args["form"] = TaskOrderForm()
cancel_url = (
render_args["cancel_url"] = (
http_request.referrer
if http_request.referrer
else url_for("task_orders.portfolio_funding", portfolio_id=portfolio_id)
)
return render_template("task_orders/edit.html", form=form, cancel_url=cancel_url)
return render_template("task_orders/edit.html", **render_args)
@task_orders_bp.route("/portfolios/<portfolio_id>/task_orders/new")
@task_orders_bp.route("/portfolios/<portfolio_id>/task_orders/<task_order_id>/edit")
@user_can(Permissions.CREATE_TASK_ORDER, message="view new task order form")
def edit(portfolio_id, task_order_id=None):
return render_task_orders_edit(portfolio_id, task_order_id)
@task_orders_bp.route("/portfolios/<portfolio_id>/task_orders/new", methods=["POST"])
@@ -35,7 +42,8 @@ def edit(portfolio_id, task_order_id=None):
)
@user_can(Permissions.CREATE_TASK_ORDER, message="create new task order")
def update(portfolio_id, task_order_id=None):
form_data = http_request.form
form_data = {**http_request.form, **http_request.files}
form = TaskOrderForm(form_data)
if form.validate():
@@ -56,4 +64,4 @@ def update(portfolio_id, task_order_id=None):
)
else:
flash("form_errors")
return render_template("task_orders/edit.html", form=form)
return render_task_orders_edit(portfolio_id, task_order_id), 400