External-Mirrors/awx
2
0
Fork 0
mirror of https://github.com/ansible/awx.git synced 2026-05-10 02:47:36 -02:30
Code Issues Packages Projects Releases Wiki Activity

Expand role visibility such that you can always see all roles on any objects you can see

Browse Source 
Completes #2774
This commit is contained in:
Akita Noek
2016-07-05 15:06:25 -04:00
parent e818daa74f
commit a126736332
1 changed files with 5 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
awx/main/models/rbac.py
View File

@@ -382,9 +382,10 @@ class Role(models.Model):
qs = Role.objects.extra( qs = Role.objects.extra(
where = [''' where = ['''
%(roles_table)s.id IN ( %(roles_table)s.id IN (
SELECT descendent_id FROM %(ancestors_table)s WHERE ancestor_id IN (%(ids)s) SELECT t2.ancestor_id
UNION FROM %(ancestors_table)s as t1
SELECT ancestor_id FROM %(ancestors_table)s WHERE descendent_id IN (%(ids)s) LEFT JOIN %(ancestors_table)s as t2 ON (t1.descendent_id = t2.descendent_id)
WHERE t1.ancestor_id IN (%(ids)s)
) )
''' % sql_params] ''' % sql_params]
) )
@@ -393,23 +394,7 @@ class Role(models.Model):
@staticmethod @staticmethod
@check_singleton @check_singleton
def filter_visible_roles(user, roles_qs): def filter_visible_roles(user, roles_qs):
sql_params = { return roles_qs.filter(id__in=Role.visible_roles(user))
'ancestors_table': Role.ancestors.through._meta.db_table,
'parents_table': Role.parents.through._meta.db_table,
'roles_table': Role._meta.db_table,
'ids': ','.join(str(x) for x in user.roles.all().values_list('id', flat=True))
}
qs = roles_qs.extra(
where = ['''
EXISTS (
SELECT 1 FROM
%(ancestors_table)s
WHERE (descendent_id = %(roles_table)s.id AND ancestor_id IN (%(ids)s))
OR (ancestor_id = %(roles_table)s.id AND descendent_id IN (%(ids)s))
) ''' % sql_params]
)
return qs
@staticmethod @staticmethod
def singleton(name): def singleton(name):