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

Adding comments to signals for rbac activity stream

Browse Source
This commit is contained in:
Wayne Witzel III
2016-06-27 11:41:00 -04:00
parent 5e2a3b3ef2
commit e1853372f7
1 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
awx/main/signals.py
View File

@@ -168,13 +168,15 @@ def rbac_activity_stream(instance, sender, **kwargs):
role = kwargs['model'].objects.filter(pk__in=kwargs['pk_set']).first() role = kwargs['model'].objects.filter(pk__in=kwargs['pk_set']).first()
# don't record implicit creation / parents # don't record implicit creation / parents
if role.content_type is not None: if role.content_type is not None:
parent = role.content_type.name + "." + role.role_field parent = role.content_type.name + "." + role.role_field
# Get the list of implicit parents that were defined at the class level.
# We have to take this list from the class property to avoid including parents
# that may have been added since the creation of the ImplicitRoleField
implicit_parents = getattr(instance.content_object.__class__, instance.role_field).field.parent_role implicit_parents = getattr(instance.content_object.__class__, instance.role_field).field.parent_role
if type(implicit_parents) != list: if type(implicit_parents) != list:
implicit_parents = [implicit_parents] implicit_parents = [implicit_parents]
# Ignore any singleton parents we find. If the parent for the role
# matches any of the implicit parents we find, skip recording the activity stream.
for ip in implicit_parents: for ip in implicit_parents:
if '.' not in ip and 'singleton:' not in ip: if '.' not in ip and 'singleton:' not in ip:
ip = instance.content_type.name + "." + ip ip = instance.content_type.name + "." + ip