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

Fix a bug where users in a different org would not show up in the entity search.

Browse source
This commit is contained in:
yackob03 2013-12-27 16:56:31 -05:00
parent af697efba3
commit e23bee99ec
1 changed files with 10 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
data/model.py
View file

@ -386,7 +386,6 @@ def get_matching_teams(team_prefix, organization):
def get_matching_users(username_prefix, robot_namespace=None,
organization=None):
Org = User.alias()
direct_user_query = (User.username ** (username_prefix + '%') &
(User.organization == False) & (User.robot == False))
@ -396,22 +395,25 @@ def get_matching_users(username_prefix, robot_namespace=None,
(User.username ** (robot_prefix + '%') &
(User.robot == True)))
query = User.select(User.username, Org.username, User.robot).where(direct_user_query)
query = (User
.select(User.username, Team.id, User.robot)
.where(direct_user_query))
if organization:
with_team = query.join(TeamMember, JOIN_LEFT_OUTER).join(Team,
JOIN_LEFT_OUTER)
with_org = with_team.join(Org, JOIN_LEFT_OUTER,
on=(Org.id == Team.organization))
query = with_org.where((Org.id == organization) | (Org.id >> None))
query = (query
.join(TeamMember, JOIN_LEFT_OUTER)
.join(Team, JOIN_LEFT_OUTER, on=((Team.id == TeamMember.team) &
(Team.organization == organization))))
class MatchingUserResult(object):
def __init__(self, *args):
logger.debug("tuple: %s" % str(args))
self.username = args[0]
self.is_robot = args[2]
if organization:
self.is_org_member = (args[1] == organization.username)
self.is_org_member = (args[1] != None)
else:
self.is_org_member = None