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

Streamline and cleanup the entity-reference so it can be used everywhere in a simple fashion. Also changes the entity-search to use the reference as its icon source when in persistent mode

Browse source
This commit is contained in:
Joseph Schorr 2014-01-21 16:23:00 -05:00
parent c2928a96d0
commit 74df6b1df7
11 changed files with 87 additions and 46 deletions
Download patch file Download diff file Expand all files Collapse all files

12
endpoints/api.py
View file

@ -672,7 +672,8 @@ def get_organization_members(orgname):
members = model.get_organization_members_with_teams(org)
for member in members:
if not member.user.username in members_dict:
members_dict[member.user.username] = {'username': member.user.username,
members_dict[member.user.username] = {'name': member.user.username,
'kind': 'user',
'is_robot': member.user.robot,
'teams': []}
@ -697,7 +698,8 @@ def get_organization_member(orgname, membername):
member_teams = model.get_organization_members_with_teams(org, membername=membername)
for member in member_teams:
if not member_dict:
member_dict = {'username': member.user.username,
member_dict = {'name': member.user.username,
'kind': 'user',
'is_robot': member.user.robot,
'teams': []}
@ -741,7 +743,8 @@ def get_organization_private_allowed(orgname):
def member_view(member):
return {
'username': member.username,
'name': member.username,
'kind': 'user',
'is_robot': member.robot,
}
@ -2064,7 +2067,8 @@ def log_view(log):
if log.performer:
view['performer'] = {
'username': log.performer.username,
'kind': 'user',
'name': log.performer.username,
'is_robot': log.performer.robot,
}