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

Combine similar routes and templates, delete unused TO form templates

Browse Source
This commit is contained in:
leigh-mil
2019-06-03 14:37:02 -04:00
committed by Montana
parent 0a2d241dc4
commit b97ae02a93
14 changed files with 47 additions and 532 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -9,27 +9,44 @@ 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 new(portfolio_id):
def edit(portfolio_id, task_order_id=None):
form = None
if task_order_id:
task_order = TaskOrders.get(task_order_id)
form = TaskOrderForm(number=task_order.number)
else:
form = TaskOrderForm()
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/new.html", form=TaskOrderForm(), cancel_url=cancel_url
)
return render_template("task_orders/edit.html", form=form, cancel_url=cancel_url)
@task_orders_bp.route("/portfolios/<portfolio_id>/task_orders/new", methods=["POST"])
@task_orders_bp.route(
"/portfolios/<portfolio_id>/task_orders/<task_order_id>", methods=["POST"]
)
@user_can(Permissions.CREATE_TASK_ORDER, message="create new task order")
def create(portfolio_id):
def update(portfolio_id, task_order_id=None):
form_data = http_request.form
form = TaskOrderForm(form_data)
# todo: add in better error handling for dupe TO numbers
if form.validate():
task_order = TaskOrders.create(g.current_user, portfolio_id, **form.data)
task_order = None
if task_order_id:
task_order = TaskOrders.update(task_order_id, **form.data)
else:
task_order = TaskOrders.create(g.current_user, portfolio_id, **form.data)
flash("task_order_draft")
return redirect(
url_for(
"task_orders.edit",
@@ -37,33 +54,6 @@ def create(portfolio_id):
task_order_id=task_order.id,
)
)
else:
flash("form_errors")
return render_template("task_orders/new.html", form=form)
# Combine with new route?
@task_orders_bp.route("/portfolios/<portfolio_id>/task_orders/<task_order_id>/edit")
@user_can(Permissions.CREATE_TASK_ORDER, message="update task order")
def edit(portfolio_id, task_order_id):
task_order = TaskOrders.get(task_order_id)
form = TaskOrderForm(number=task_order.number)
return render_template("task_orders/edit.html", form=form)
# Combine with create route?
@task_orders_bp.route(
"/portfolios/<portfolio_id>/task_orders/<task_order_id>", methods=["POST"]
)
@user_can(Permissions.CREATE_TASK_ORDER, message="update task order")
def update(portfolio_id, task_order_id=None):
form_data = http_request.form
form = TaskOrderForm(form_data)
if form.validate():
TaskOrders.update(task_order_id, **form.data)
flash("task_order_draft")
return render_template("task_orders/new.html", form=form)
else:
flash("form_errors")
return render_template("task_orders/edit.html", form=form)