Add validator to TO number input and add cancel button to form

atst/routes/task_orders/new.py

@@ -1,4 +1,4 @@
-from flask import g, render_template, request as http_request
+from flask import g, redirect, render_template, request as http_request, url_for
 
 from . import task_orders_bp
 from atst.domain.authz.decorator import user_can_access_decorator as user_can
@@ -11,7 +11,14 @@ from atst.utils.flash import formatted_flash as flash
 @task_orders_bp.route("/portfolios/<portfolio_id>/task_orders/new")
 @user_can(Permissions.CREATE_TASK_ORDER, message="view new task order form")
 def new(portfolio_id):
-    return render_template("task_orders/new.html", 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
+    )
 
 
 @task_orders_bp.route("/portfolios/<portfolio_id>/task_orders/new", methods=["POST"])
@@ -19,22 +26,32 @@ def new(portfolio_id):
 def create(portfolio_id):
     form_data = http_request.form
     form = TaskOrderForm(form_data)
-
+    # todo: add in better error handling for dupe TO numbers
     if form.validate():
-        TaskOrders.create(g.current_user, portfolio_id, **form.data)
+        task_order = TaskOrders.create(g.current_user, portfolio_id, **form.data)
         flash("task_order_draft")
-        return render_template("task_orders/new.html", form=form)
+        return redirect(
+            url_for(
+                "task_orders.edit",
+                portfolio_id=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, taks_order_id):
-    return render_template("task_orders/edit", form=TaskOrderForm())
+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"]
 )
@@ -49,4 +66,4 @@ def update(portfolio_id, task_order_id=None):
         return render_template("task_orders/new.html", form=form)
     else:
         flash("form_errors")
-        return render_template("task_orders/new.html", form=form)
+        return render_template("task_orders/edit.html", form=form)