From ff1727b74f79f86c98905ef5dcc09ffe6544629a Mon Sep 17 00:00:00 2001 From: Montana Date: Wed, 17 Oct 2018 11:42:01 -0400 Subject: [PATCH 1/2] Allow CCPO users to submit financial verification on requests they create --- atst/routes/requests/index.py | 27 ++++++++++++++------------- 1 file changed, 14 insertions(+), 13 deletions(-) diff --git a/atst/routes/requests/index.py b/atst/routes/requests/index.py index b348dec7..98648823 100644 --- a/atst/routes/requests/index.py +++ b/atst/routes/requests/index.py @@ -56,20 +56,21 @@ class RequestsIndex(object): } def _edit_link_for_request(self, viewing_role, request): - if viewing_role == "ccpo": + if request.creator == g.current_user: + if request.is_pending_financial_verification: + return url_for("requests.financial_verification", request_id=request.id) + elif request.is_pending_financial_verification_changes: + return url_for( + "requests.financial_verification", request_id=request.id, extended=True + ) + elif request.is_approved: + return url_for("requests.view_request_details", request_id=request.id) + else: + return url_for( + "requests.requests_form_update", screen=1, request_id=request.id + ) + elif viewing_role == "ccpo": return url_for("requests.approval", request_id=request.id) - elif request.is_pending_financial_verification: - return url_for("requests.financial_verification", request_id=request.id) - elif request.is_pending_financial_verification_changes: - return url_for( - "requests.financial_verification", request_id=request.id, extended=True - ) - elif request.is_pending_ccpo_action or request.is_approved: - return url_for("requests.view_request_details", request_id=request.id) - else: - return url_for( - "requests.requests_form_update", screen=1, request_id=request.id - ) def _map_request(self, request, viewing_role): time_created = pendulum.instance(request.time_created) From caaad2154284cc7135ebe1f2a1e2cf9e8342547d Mon Sep 17 00:00:00 2001 From: Montana Date: Wed, 17 Oct 2018 13:42:33 -0400 Subject: [PATCH 2/2] Formatting --- atst/routes/requests/index.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/atst/routes/requests/index.py b/atst/routes/requests/index.py index 98648823..b479c848 100644 --- a/atst/routes/requests/index.py +++ b/atst/routes/requests/index.py @@ -61,7 +61,9 @@ class RequestsIndex(object): return url_for("requests.financial_verification", request_id=request.id) elif request.is_pending_financial_verification_changes: return url_for( - "requests.financial_verification", request_id=request.id, extended=True + "requests.financial_verification", + request_id=request.id, + extended=True, ) elif request.is_approved: return url_for("requests.view_request_details", request_id=request.id)