From b91d869bbe78ecebedc626da487557e7e3e748ae Mon Sep 17 00:00:00 2001
From: Montana <montana-ctr@friends.dds.mil>
Date: Mon, 28 Jan 2019 11:12:11 -0500
Subject: [PATCH] Clean up routes

---
 atst/routes/portfolios/task_orders.py        | 11 +++++++----
 templates/portfolios/task_orders/review.html |  4 +---
 templates/portfolios/task_orders/show.html   |  2 +-
 3 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/atst/routes/portfolios/task_orders.py b/atst/routes/portfolios/task_orders.py
index 3c63137c..6883dc2f 100644
--- a/atst/routes/portfolios/task_orders.py
+++ b/atst/routes/portfolios/task_orders.py
@@ -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")
-def review_task_order(portfolio_id, task_order_id, form=None):
-    portfolio = Portfolios.get(g.current_user, portfolio_id)
+def ko_review(portfolio_id, task_order_id, form=None):
     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(
         "/portfolios/task_orders/review.html",
         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",
     methods=["POST"],
 )
-def submit_review_task_order(portfolio_id, task_order_id, form=None):
-    portfolio = Portfolios.get(g.current_user, portfolio_id)
+def submit_ko_review(portfolio_id, task_order_id, form=None):
     task_order = TaskOrders.get(g.current_user, task_order_id)
     form = KOReviewForm(http_request.form)
+    portfolio = Portfolios.get(g.current_user, portfolio_id)
 
     if form.validate():
+        # add form data to TO data
         return redirect(url_for("task_orders.view_task_order"))
     else:
+        # stay on the page and fix the fields that didnt validate
         return review(portfolio.id, task_order.id)
 
 
diff --git a/templates/portfolios/task_orders/review.html b/templates/portfolios/task_orders/review.html
index 1615a283..1453cfe4 100644
--- a/templates/portfolios/task_orders/review.html
+++ b/templates/portfolios/task_orders/review.html
@@ -15,9 +15,7 @@
 
   {% block form_action %}
     {% 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">
-    {% 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">
+      <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 %}
 
diff --git a/templates/portfolios/task_orders/show.html b/templates/portfolios/task_orders/show.html
index cd04a4bc..a75a1836 100644
--- a/templates/portfolios/task_orders/show.html
+++ b/templates/portfolios/task_orders/show.html
@@ -93,7 +93,7 @@
           complete=all_sections_complete) %}
           <div class="task-order-next-steps__action col">
             <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">
                 Edit
             </a>