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

Merge pull request #2858 from coreos-inc/duplicate-org

Browse source 
Remove duplicate orgs when using public namespaces
This commit is contained in:
josephschorr 2017-08-29 13:22:01 -04:00 committed by GitHub
commit c37a74770a
1 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
endpoints/api/user.py
View file

@ -91,12 +91,12 @@ def user_view(user, previous_username=None):
return org_response
# Retrieve the organizations for the user.
organizations = list(model.organization.get_user_organizations(user.username))
organizations = {o.username: o for o in model.organization.get_user_organizations(user.username)}
# Add any public namespaces.
public_namespaces = app.config.get('PUBLIC_NAMESPACES', [])
if public_namespaces:
organizations.extend([model.user.get_namespace_user(ns) for ns in public_namespaces])
organizations.update({ns: model.user.get_namespace_user(ns) for ns in public_namespaces})
def login_view(login):
try:
@ -144,7 +144,7 @@ def user_view(user, previous_username=None):
user_view_perm = UserReadPermission(user.username)
if user_view_perm.can():
user_response.update({
'organizations': [org_view(o, user_admin=user_admin.can()) for o in organizations],
'organizations': [org_view(o, user_admin=user_admin.can()) for o in organizations.values()],
})