From 1248be9b7cd725d3988a57a2298d8f8bd005a166 Mon Sep 17 00:00:00 2001 From: Wayne Witzel III Date: Fri, 28 Apr 2017 09:59:13 -0400 Subject: [PATCH 1/2] Add inventory_id to websocket data --- awx/main/models/inventory.py | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/awx/main/models/inventory.py b/awx/main/models/inventory.py index 4cb049f445..1d0b82c4c1 100644 --- a/awx/main/models/inventory.py +++ b/awx/main/models/inventory.py @@ -1278,6 +1278,10 @@ class InventoryUpdate(UnifiedJob, InventorySourceOptions, JobNotificationMixin): def websocket_emit_data(self): websocket_data = super(InventoryUpdate, self).websocket_emit_data() + + if self.inventory_source.inventory is not None: + websocket_data.update(dict(inventory_id=self.inventory_source.inventory.pk)) + if self.inventory_source.deprecated_group is not None: # TODO: remove in 3.3 websocket_data.update(dict(group_id=self.inventory_source.deprecated_group.id)) return websocket_data From b6519830452d50cde5f139b1491abbc63a3227f0 Mon Sep 17 00:00:00 2001 From: Wayne Witzel III Date: Fri, 28 Apr 2017 12:22:49 -0400 Subject: [PATCH 2/2] also add inventory_source_id to websocket data --- awx/main/models/inventory.py | 1 + 1 file changed, 1 insertion(+) diff --git a/awx/main/models/inventory.py b/awx/main/models/inventory.py index 1d0b82c4c1..c0d6af6a28 100644 --- a/awx/main/models/inventory.py +++ b/awx/main/models/inventory.py @@ -1278,6 +1278,7 @@ class InventoryUpdate(UnifiedJob, InventorySourceOptions, JobNotificationMixin): def websocket_emit_data(self): websocket_data = super(InventoryUpdate, self).websocket_emit_data() + websocket_data.update(dict(inventory_source_id=self.inventory_source.pk)) if self.inventory_source.inventory is not None: websocket_data.update(dict(inventory_id=self.inventory_source.inventory.pk))