Merge branch 'orgs' of https://bitbucket.org/yackob03/quay into orgs
This commit is contained in:
commit
96730965cd
1 changed files with 10 additions and 10 deletions
|
@ -202,26 +202,26 @@ def get_matching_entities(prefix):
|
||||||
organization_name = request.args.get('organization', None)
|
organization_name = request.args.get('organization', None)
|
||||||
organization = None
|
organization = None
|
||||||
if organization_name:
|
if organization_name:
|
||||||
try:
|
permission = OrganizationMemberPermission(organization_name)
|
||||||
organization = model.get_organization(organization_name)
|
if permission.can():
|
||||||
except:
|
try:
|
||||||
pass
|
organization = model.get_organization(organization_name)
|
||||||
|
except:
|
||||||
|
pass
|
||||||
|
|
||||||
if organization:
|
if organization:
|
||||||
# TODO: ensure that the user has access to the organization
|
teams = model.get_matching_teams(prefix, organization)
|
||||||
teams = model.get_matching_teams(prefix, organization)
|
|
||||||
|
|
||||||
users = model.get_matching_users(prefix, organization)
|
users = model.get_matching_users(prefix, organization)
|
||||||
|
|
||||||
def team_view(team):
|
def team_view(team):
|
||||||
return {
|
return {
|
||||||
'name': team.name,
|
'name': team.name,
|
||||||
'kind': 'team'
|
'kind': 'team',
|
||||||
|
'is_org_member': True,
|
||||||
}
|
}
|
||||||
|
|
||||||
def user_view(user):
|
def user_view(user):
|
||||||
# TODO: Return whether the user is outside the organization (if one is
|
|
||||||
# specified)
|
|
||||||
return {
|
return {
|
||||||
'name': user.username,
|
'name': user.username,
|
||||||
'kind': 'user',
|
'kind': 'user',
|
||||||
|
|
Reference in a new issue