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

coalesce data without setting

Browse Source
This commit is contained in:
AlanCoding
2018-11-09 14:00:45 -05:00
parent 5562e636ea
commit 658f87953e
3 changed files with 6 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
awx/main/signals.py
View File

@@ -491,13 +491,12 @@ def activity_stream_delete(sender, instance, **kwargs):
if isinstance(instance, Inventory):
if not kwargs.get('inventory_delete_flag', False):
return
if settings.ACTIVITY_STREAM_COALESCE_ENTRIES:
# Add additional data about child hosts / groups that will be deleted
changes['coalesce_data'] = {
'hosts_deleted': instance.hosts.count(),
'groups_deleted': instance.groups.count()
}
elif isinstance(instance, (Host, Group)) and instance.inventory.pending_deletion and settings.ACTIVITY_STREAM_COALESCE_ENTRIES:
# Add additional data about child hosts / groups that will be deleted
changes['coalesced_data'] = {
'hosts_deleted': instance.hosts.count(),
'groups_deleted': instance.groups.count()
}
elif isinstance(instance, (Host, Group)) and instance.inventory.pending_deletion:
return # accounted for by inventory entry, above
_type = type(instance)
if getattr(_type, '_deferred', False):