zware/awx
1
0
Fork 0
mirror of https://github.com/ZwareBear/awx.git synced 2026-04-20 06:51:48 -05:00
Code Issues Packages Projects Releases Wiki Activity

remove the ORing of local roles, check against organization roles

Browse Source
This commit is contained in:
Wayne Witzel III
2016-05-17 13:56:11 -04:00
parent 863105435e
commit 2e4c26a77f
3 changed files with 5 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
awx/main/fields.py
View File

@@ -225,14 +225,7 @@ class ImplicitRoleField(models.ForeignKey):
parent_roles = set()
for path in paths:
if type(path) == tuple:
for or_path in path:
if or_path.startswith("singleton:"):
raise Exception("Unable to use Singleton role in an OR context.")
parents = resolve_role_field(instance, or_path)
if len(parents) is not 0:
break
elif path.startswith("singleton:"):
if path.startswith("singleton:"):
singleton_name = path[10:]
Role_ = get_current_apps().get_model('main', 'Role')
qs = Role_.objects.filter(singleton_name=singleton_name)