vbatts/quay
Archived
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Add 'Automatic' ServiceKeyApprovalType

Browse source
This commit is contained in:
Evan Cordell 2016-04-29 09:14:50 -05:00 • committed by Jimmy Zelinskie
parent c766727d1d
commit 2242c6773d
5 changed files with 13 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

4
endpoints/api/superuser.py
View file

@ -142,8 +142,6 @@ def org_view(org):
}
def user_view(user, password=None):
if user is None:
return None
user_data = {
'kind': 'user',
'name': user.username,
@ -493,7 +491,7 @@ def key_view(key):
def approval_view(approval):
return {
'approver': user_view(approval.approver),
'approver': user_view(approval.approver) if approval.approver else None,
'approval_type': approval.approval_type,
'approved_date': approval.approved_date,
'notes': approval.notes,