Merge branch 'orgs' of https://bitbucket.org/yackob03/quay into orgs

This commit is contained in:
Joseph Schorr 2013-11-01 19:34:56 -04:00
commit 09afe0753f
5 changed files with 181 additions and 79 deletions

View file

@ -211,11 +211,11 @@ def get_organization(orgname):
abort(404)
user = current_user.db_user()
organization = model.lookup_organization(orgname, username = user.username)
if not organization:
org = model.get_organization(orgname)
if not org:
abort(404)
teams = model.get_user_teams(user.username, organization)
teams = model.get_user_teams_within_org(user.username, org)
return jsonify(org_view(organization, teams))