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

discover content type when object2 is a role

Browse Source
This commit is contained in:
Wayne Witzel III
2016-05-26 12:45:48 -04:00
parent b0526cdd6a
commit 13f0b440c3
1 changed files with 6 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
awx/main/signals.py
View File

@@ -379,11 +379,16 @@ def activity_stream_associate(sender, instance, **kwargs):
obj1 = instance obj1 = instance
object1=camelcase_to_underscore(obj1.__class__.__name__) object1=camelcase_to_underscore(obj1.__class__.__name__)
obj_rel = sender.__module__ + "." + sender.__name__ obj_rel = sender.__module__ + "." + sender.__name__
for entity_acted in kwargs['pk_set']: for entity_acted in kwargs['pk_set']:
obj2 = kwargs['model'] obj2 = kwargs['model']
obj2_id = entity_acted obj2_id = entity_acted
obj2_actual = obj2.objects.get(id=obj2_id) obj2_actual = obj2.objects.get(id=obj2_id)
object2 = camelcase_to_underscore(obj2.__name__) if isinstance(obj2_actual, Role) and hasattr(obj2_actual, 'content_object'):
obj2_actual = obj2_actual.content_object
object2 = camelcase_to_underscore(obj2_actual.__class__.__name__)
else:
object2 = camelcase_to_underscore(obj2.__name__)
# Skip recording any inventory source, or system job template changes here. # Skip recording any inventory source, or system job template changes here.
if isinstance(obj1, InventorySource) or isinstance(obj2_actual, InventorySource): if isinstance(obj1, InventorySource) or isinstance(obj2_actual, InventorySource):
continue continue