From f7e9d07dad669295e894abd061d484e26e394496 Mon Sep 17 00:00:00 2001
From: Wayne Witzel III <wayne@riotousliving.com>
Date: Mon, 11 Jul 2016 15:25:35 -0400
Subject: [PATCH] ensure CustomInventoryScripts render correctly in the
 ActivityStream

---
 awx/api/serializers.py | 7 ++++++-
 awx/main/signals.py    | 1 +
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/awx/api/serializers.py b/awx/api/serializers.py
index 9ce7aee670..973c40f3d5 100644
--- a/awx/api/serializers.py
+++ b/awx/api/serializers.py
@@ -87,6 +87,7 @@ SUMMARIZABLE_FK_FIELDS = {
     'current_update': DEFAULT_SUMMARY_FIELDS + ('status', 'failed', 'license_error'),
     'current_job': DEFAULT_SUMMARY_FIELDS + ('status', 'failed', 'license_error'),
     'inventory_source': ('source', 'last_updated', 'status'),
+    'custom_inventory_script': DEFAULT_SUMMARY_FIELDS,
     'source_script': ('name', 'description'),
     'role': ('id', 'role_field'),
     'notification_template': DEFAULT_SUMMARY_FIELDS,
@@ -2621,7 +2622,11 @@ class ActivityStreamSerializer(BaseSerializer):
             if getattr(obj, fk).exists():
                 rel[fk] = []
                 for thisItem in allm2m:
-                    rel[fk].append(reverse('api:' + fk + '_detail', args=(thisItem.id,)))
+                    if fk == 'custom_inventory_script':
+                        rel[fk].append(reverse('api:inventory_script_detail', args=(thisItem.id,)))
+                    else:
+                        rel[fk].append(reverse('api:' + fk + '_detail', args=(thisItem.id,)))
+
                     if fk == 'schedule':
                         rel['unified_job_template'] = thisItem.unified_job_template.get_absolute_url()
         return rel
diff --git a/awx/main/signals.py b/awx/main/signals.py
index 1c57fea8ae..7389f01763 100644
--- a/awx/main/signals.py
+++ b/awx/main/signals.py
@@ -323,6 +323,7 @@ model_serializer_mapping = {
     Host: HostSerializer,
     Group: GroupSerializer,
     InventorySource: InventorySourceSerializer,
+    CustomInventoryScript: CustomInventoryScriptSerializer,
     Credential: CredentialSerializer,
     Team: TeamSerializer,
     Project: ProjectSerializer,