From e911bdc3da1c1391aa852b1db82a6b9c2c60c50e Mon Sep 17 00:00:00 2001 From: Matthew Jones Date: Tue, 4 Feb 2014 09:29:20 -0500 Subject: [PATCH] Updating AC-984... delay field computation until after the group has been removed --- awx/main/models/inventory.py | 17 +++++++++++------ 1 file changed, 11 insertions(+), 6 deletions(-) diff --git a/awx/main/models/inventory.py b/awx/main/models/inventory.py index acd969b2e9..3c626e9bf2 100644 --- a/awx/main/models/inventory.py +++ b/awx/main/models/inventory.py @@ -357,12 +357,17 @@ class Group(CommonModelNameNotUnique): When marking groups inactive, remove all associations to related groups/hosts/inventory_sources. ''' - super(Group, self).mark_inactive(save=save) - self.inventory_source.mark_inactive(save=save) - self.inventory_sources.clear() - self.parents.clear() - self.children.clear() - self.hosts.clear() + from awx.main.signals import ignore_inventory_computed_fields + i = self.inventory + + with ignore_inventory_computed_fields(): + super(Group, self).mark_inactive(save=save) + self.inventory_source.mark_inactive(save=save) + self.inventory_sources.clear() + self.parents.clear() + self.children.clear() + self.hosts.clear() + i.update_computed_fields() def update_computed_fields(self): '''