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

Merge pull request #168 from dod-ccpo/non-ccpo-alerts

Browse Source 
CCPO should not see request status alerts
This commit is contained in:
dandds 2018-08-14 11:07:03 -04:00 committed by GitHub
commit 7fef858d24
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
atst/routes/requests/index.py
View File

@ -3,6 +3,7 @@ from flask import render_template, g, url_for
from . import requests_bp from . import requests_bp
from atst.domain.requests import Requests from atst.domain.requests import Requests
from atst.models.permissions import Permissions
def map_request(request): def map_request(request):
@ -30,15 +31,16 @@ def map_request(request):
@requests_bp.route("/requests", methods=["GET"]) @requests_bp.route("/requests", methods=["GET"])
def requests_index(): def requests_index():
requests = [] requests = []
if "review_and_approve_jedi_workspace_request" in g.current_user.atat_permissions: is_ccpo = Permissions.REVIEW_AND_APPROVE_JEDI_WORKSPACE_REQUEST in g.current_user.atat_permissions
if is_ccpo:
requests = Requests.get_many() requests = Requests.get_many()
else: else:
requests = Requests.get_many(creator=g.current_user) requests = Requests.get_many(creator=g.current_user)
mapped_requests = [map_request(r) for r in requests] mapped_requests = [map_request(r) for r in requests]
pending_fv = any(Requests.is_pending_financial_verification(r) for r in requests) pending_fv = not is_ccpo and any(Requests.is_pending_financial_verification(r) for r in requests)
pending_ccpo = any(Requests.is_pending_ccpo_approval(r) for r in requests) pending_ccpo = not is_ccpo and any(Requests.is_pending_ccpo_approval(r) for r in requests)
return render_template( return render_template(
"requests.html", "requests.html",