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

This commit is contained in:
yackob03 2013-11-07 12:55:35 -05:00
commit 2663a534d7
15 changed files with 244 additions and 26 deletions

View file

@ -326,7 +326,7 @@ def verify_user(username, password):
def get_user_organizations(username):
UserAlias = User.alias()
all_teams = User.select().join(Team).join(TeamMember)
all_teams = User.select().distinct().join(Team).join(TeamMember)
with_user = all_teams.join(UserAlias, on=(UserAlias.id == TeamMember.user))
return with_user.where(User.organization == True,
UserAlias.username == username)