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

clean up request review menu logic

Browse Source
This commit is contained in:
dandds 2018-09-13 11:20:40 -04:00
parent a84e18d888
commit 8e4430ffc5
4 changed files with 4 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
atst/routes/requests/requests_form.py
View File

@ -138,7 +138,7 @@ def view_request_details(request_id=None):
data["task_order"] = request.task_order.to_dictionary() data["task_order"] = request.task_order.to_dictionary()
return render_template( return render_template(
"requests/view_pending.html", "requests/details.html",
data=data, data=data,
request_id=request.id, request_id=request.id,
status=request.status_displayname, status=request.status_displayname,

2
templates/requests/view_pending.html → templates/requests/details.html
View File

@ -6,9 +6,7 @@
<div class="col"> <div class="col">
{% if financial_verification %} {% if financial_verification %}
{% with complete=False %}
{% include 'requests/review_menu.html' %} {% include 'requests/review_menu.html' %}
{% endwith %}
{% endif %} {% endif %}
{% if pending_review %} {% if pending_review %}

4
templates/requests/financial_verification.html
View File

@ -6,9 +6,7 @@
{% block content %} {% block content %}
{% with complete=False %} {% include 'requests/review_menu.html' %}
{% include 'requests/review_menu.html' %}
{% endwith %}
<financial inline-template v-bind:initial-data='{{ f.data|mixedContentToJson }}'> <financial inline-template v-bind:initial-data='{{ f.data|mixedContentToJson }}'>
<div class="col"> <div class="col">

4
templates/requests/review_menu.html
View File

@ -7,9 +7,7 @@
Request Information Request Information
</a> </a>
</li> </li>
{% if complete %} {% if g.matchesPath(financial_url) %}
{% set financial_status="complete" %}
{% elif g.matchesPath(financial_url) %}
{% set financial_status="active" %} {% set financial_status="active" %}
{% else %} {% else %}
{% set financial_status="incomplete" %} {% set financial_status="incomplete" %}