Move "Approval pending" alert
This commit is contained in:
parent
6cd627f820
commit
75344e2bf1
@ -143,6 +143,7 @@ def view_request_details(request_id=None):
|
|||||||
request_id=request.id,
|
request_id=request.id,
|
||||||
status=request.status_displayname,
|
status=request.status_displayname,
|
||||||
pending_review=request.is_pending_ccpo_action,
|
pending_review=request.is_pending_ccpo_action,
|
||||||
|
pending_ccpo_acceptance=request.is_pending_ccpo_acceptance,
|
||||||
financial_verification=request.is_pending_financial_verification
|
financial_verification=request.is_pending_financial_verification
|
||||||
or request.is_pending_financial_verification_changes,
|
or request.is_pending_financial_verification_changes,
|
||||||
financial_review=financial_review,
|
financial_review=financial_review,
|
||||||
|
@ -9,6 +9,10 @@
|
|||||||
{% include 'requests/review_menu.html' %}
|
{% include 'requests/review_menu.html' %}
|
||||||
{% endif %}
|
{% endif %}
|
||||||
|
|
||||||
|
{% if pending_ccpo_acceptance %}
|
||||||
|
{{ Alert('Request submitted. Approval pending.', fragment="fragments/pending_ccpo_approval_alert.html") }}
|
||||||
|
{% endif %}
|
||||||
|
|
||||||
{% if pending_review %}
|
{% if pending_review %}
|
||||||
{{ Alert('Your request is being reviewed',
|
{{ 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>",
|
message="<p>You cannot edit your submitted request while it is under review. Your request will be reviewed within 3 business days.</p>",
|
||||||
|
@ -45,9 +45,9 @@
|
|||||||
|
|
||||||
{% else %}
|
{% 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 %}
|
{% endif %}
|
||||||
|
|
||||||
|
Loading…
x
Reference in New Issue
Block a user