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

Merge remote-tracking branch 'ansible/devel' into merge-devel

Browse Source
This commit is contained in:
Akita Noek
2016-03-18 15:40:13 -04:00
parent 4fac1e96f4 69b2a3c868
commit 5741b47c54
84 changed files with 2911 additions and 157946 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
awx/main/signals.py
View File

@@ -462,9 +462,11 @@ def activity_stream_associate(sender, instance, **kwargs):
obj2_id = entity_acted
obj2_actual = obj2.objects.get(id=obj2_id)
object2 = camelcase_to_underscore(obj2.__name__)
# Skip recording any inventory source changes here.
# Skip recording any inventory source, or system job template changes here.
if isinstance(obj1, InventorySource) or isinstance(obj2_actual, InventorySource):
continue
if isinstance(obj1, SystemJobTemplate) or isinstance(obj2_actual, SystemJobTemplate):
continue
activity_entry = ActivityStream(
operation=action,
object1=object1,