From 658f87953e39feec55a403b0ca084b7af0186dfe Mon Sep 17 00:00:00 2001
From: AlanCoding <arominge@redhat.com>
Date: Fri, 9 Nov 2018 14:00:45 -0500
Subject: [PATCH] coalesce data without setting

---
 awx/main/conf.py         | 11 -----------
 awx/main/signals.py      | 13 ++++++-------
 awx/settings/defaults.py |  1 -
 3 files changed, 6 insertions(+), 19 deletions(-)

diff --git a/awx/main/conf.py b/awx/main/conf.py
index 265b1ef739..5008d72dc2 100644
--- a/awx/main/conf.py
+++ b/awx/main/conf.py
@@ -24,17 +24,6 @@ register(
     feature_required='activity_streams',
 )
 
-register(
-    'ACTIVITY_STREAM_COALESCE_ENTRIES',
-    field_class=fields.BooleanField,
-    label=_('Coalesce Select Activity Stream Entries'),
-    help_text=_('For certain processes, combine multiple entries into one. '
-                'This replaces many similar entries with a single summary entry.'),
-    category=_('System'),
-    category_slug='system',
-    feature_required='activity_streams',
-)
-
 register(
     'ACTIVITY_STREAM_ENABLED_FOR_INVENTORY_SYNC',
     field_class=fields.BooleanField,
diff --git a/awx/main/signals.py b/awx/main/signals.py
index b2b9ed8f3d..d0b472417a 100644
--- a/awx/main/signals.py
+++ b/awx/main/signals.py
@@ -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):
diff --git a/awx/settings/defaults.py b/awx/settings/defaults.py
index b102b83c86..62a4c2cbcc 100644
--- a/awx/settings/defaults.py
+++ b/awx/settings/defaults.py
@@ -919,7 +919,6 @@ SCM_EXCLUDE_EMPTY_GROUPS = True
 # Defaults for enabling/disabling activity stream.
 # Note: These settings may be overridden by database settings.
 ACTIVITY_STREAM_ENABLED = True
-ACTIVITY_STREAM_COALESCE_ENTRIES = True
 ACTIVITY_STREAM_ENABLED_FOR_INVENTORY_SYNC = False
 
 # Internal API URL for use by inventory scripts and callback plugin.