From 8e4430ffc57b23cf1103cf56e07b36dab222dacd Mon Sep 17 00:00:00 2001
From: dandds <dan-ctr@friends.dds.mil>
Date: Thu, 13 Sep 2018 11:20:40 -0400
Subject: [PATCH] clean up request review menu logic

---
 atst/routes/requests/requests_form.py                  | 2 +-
 templates/requests/{view_pending.html => details.html} | 4 +---
 templates/requests/financial_verification.html         | 4 +---
 templates/requests/review_menu.html                    | 4 +---
 4 files changed, 4 insertions(+), 10 deletions(-)
 rename templates/requests/{view_pending.html => details.html} (88%)

diff --git a/atst/routes/requests/requests_form.py b/atst/routes/requests/requests_form.py
index 3e825f9e..5eaa3f57 100644
--- a/atst/routes/requests/requests_form.py
+++ b/atst/routes/requests/requests_form.py
@@ -138,7 +138,7 @@ def view_request_details(request_id=None):
         data["task_order"] = request.task_order.to_dictionary()
 
     return render_template(
-        "requests/view_pending.html",
+        "requests/details.html",
         data=data,
         request_id=request.id,
         status=request.status_displayname,
diff --git a/templates/requests/view_pending.html b/templates/requests/details.html
similarity index 88%
rename from templates/requests/view_pending.html
rename to templates/requests/details.html
index e4520cfb..07bd49a7 100644
--- a/templates/requests/view_pending.html
+++ b/templates/requests/details.html
@@ -6,9 +6,7 @@
 <div class="col">
 
   {% if financial_verification %}
-    {% with complete=False %}
-      {% include 'requests/review_menu.html' %}
-    {% endwith %}
+    {% include 'requests/review_menu.html' %}
   {% endif %}
 
   {% if pending_review %}
diff --git a/templates/requests/financial_verification.html b/templates/requests/financial_verification.html
index 74b2ff72..f3950f00 100644
--- a/templates/requests/financial_verification.html
+++ b/templates/requests/financial_verification.html
@@ -6,9 +6,7 @@
 
 {% block content %}
 
-{% with complete=False %}
-  {% include 'requests/review_menu.html' %}
-{% endwith %}
+{% include 'requests/review_menu.html' %}
 
 <financial inline-template v-bind:initial-data='{{ f.data|mixedContentToJson }}'>
 <div class="col">
diff --git a/templates/requests/review_menu.html b/templates/requests/review_menu.html
index e8cf6d85..b8546233 100644
--- a/templates/requests/review_menu.html
+++ b/templates/requests/review_menu.html
@@ -7,9 +7,7 @@
         Request Information
       </a>
     </li>
-    {% if complete %}
-      {% set financial_status="complete" %}
-    {% elif g.matchesPath(financial_url) %}
+    {% if g.matchesPath(financial_url) %}
       {% set financial_status="active" %}
     {% else %}
       {% set financial_status="incomplete" %}