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

Move "Approval pending" alert

Browse Source
This commit is contained in:
richard-dds 2018-09-14 11:17:29 -04:00
parent 6cd627f820
commit 75344e2bf1
3 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -143,6 +143,7 @@ def view_request_details(request_id=None):
request_id=request.id,
status=request.status_displayname,
pending_review=request.is_pending_ccpo_action,
pending_ccpo_acceptance=request.is_pending_ccpo_acceptance,
financial_verification=request.is_pending_financial_verification
or request.is_pending_financial_verification_changes,
financial_review=financial_review,

4
templates/requests/details.html
View File

@ -9,6 +9,10 @@
{% include 'requests/review_menu.html' %}
{% endif %}
{% if pending_ccpo_acceptance %}
{{ Alert('Request submitted. Approval pending.', fragment="fragments/pending_ccpo_approval_alert.html") }}
{% endif %}
{% if pending_review %}
{{ Alert('Your request is being reviewed',
message="<p>You cannot edit your submitted request while it is under review. Your request will be reviewed within 3 business days.</p>",

4
templates/requests/index.html
View File

@ -45,9 +45,9 @@
{% else %}
{% if pending_ccpo_approval %}
{% if pending_financial_verification %}
{{ Alert('Request submitted. Approval pending.', fragment="fragments/pending_ccpo_approval_alert.html") }}
{{ Alert('Pending Financial Verification', fragment="fragments/pending_financial_verification.html") }}
{% endif %}