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

Fix the repo search to include repos that you get through a team and repos for which you have admin on the org.

Browse source
This commit is contained in:
yackob03 2013-11-07 22:44:18 -05:00
parent 52e82cfb10
commit d524559bce
3 changed files with 51 additions and 28 deletions
Download patch file Download diff file Expand all files Collapse all files

67
data/model.py
View file

@ -405,34 +405,59 @@ def get_visible_repositories(username=None, include_public=True, limit=None,
if not username and not include_public:
return []
query = Repository.select().distinct()
if namespace:
query = query.where(Repository.namespace == namespace)
query = query.join(Visibility)
or_clauses = []
if include_public:
or_clauses.append((Visibility.name == 'public'))
query = (Repository
.select(Repository, Visibility)
.distinct()
.join(Visibility)
.switch(Repository)
.join(RepositoryPermission, JOIN_LEFT_OUTER))
where_clause = None
admin_query = None
if username:
with_perms = query.switch(Repository).join(RepositoryPermission,
JOIN_LEFT_OUTER)
query = with_perms.join(User)
or_clauses.append(User.username == username)
UserThroughTeam = User.alias()
Org = User.alias()
AdminTeam = Team.alias()
AdminTeamMember = TeamMember.alias()
AdminUser = User.alias()
if sort:
with_images = query.switch(Repository).join(Image, JOIN_LEFT_OUTER)
query = with_images.order_by(Image.created.desc())
query = (query
.join(User, JOIN_LEFT_OUTER)
.switch(RepositoryPermission)
.join(Team, JOIN_LEFT_OUTER)
.join(TeamMember, JOIN_LEFT_OUTER)
.join(UserThroughTeam, JOIN_LEFT_OUTER, on=(UserThroughTeam.id ==
TeamMember.user))
.switch(Repository)
.join(Org, JOIN_LEFT_OUTER, on=(Org.username == Repository.namespace))
.join(AdminTeam, JOIN_LEFT_OUTER, on=(Org.id ==
AdminTeam.organization))
.join(TeamRole, JOIN_LEFT_OUTER)
.switch(AdminTeam)
.join(AdminTeamMember, JOIN_LEFT_OUTER, on=(AdminTeam.id ==
AdminTeamMember.team))
.join(AdminUser, JOIN_LEFT_OUTER, on=(AdminTeamMember.user ==
AdminUser.id)))
if (or_clauses):
query = query.where(reduce(operator.or_, or_clauses))
where_clause = ((User.username == username) |
(UserThroughTeam.username == username) |
((AdminUser.username == username) &
(TeamRole.name == 'admin')))
if namespace:
where_clause = where_clause & (Repository.namespace == namespace)
if include_public:
new_clause = (Visibility.name == 'public')
if where_clause:
where_clause = where_clause | new_clause
else:
where_clause = new_clause
if limit:
query = query.limit(limit)
query.limit(limit)
return query
return query.where(where_clause)
def get_matching_repositories(repo_term, username=None):