External-Mirrors/awx
2
0
Fork 0
mirror of https://github.com/ansible/awx.git synced 2026-05-09 18:37:36 -02:30
Code Issues Packages Projects Releases Wiki Activity

Updating AC-984... only conditionally recompute inventory fields in group delete if it isn't a part of an inventory delete

Browse Source
This commit is contained in:
Matthew Jones
2014-02-04 09:55:55 -05:00
parent e911bdc3da
commit 00156a5518
1 changed files with 12 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
awx/main/models/inventory.py
View File

@@ -105,7 +105,7 @@ class Inventory(CommonModel):
for host in self.hosts.filter(active=True): for host in self.hosts.filter(active=True):
host.mark_inactive() host.mark_inactive()
for group in self.groups.filter(active=True): for group in self.groups.filter(active=True):
group.mark_inactive() group.mark_inactive(recompute=False)
for inventory_source in self.inventory_sources.filter(active=True): for inventory_source in self.inventory_sources.filter(active=True):
inventory_source.mark_inactive() inventory_source.mark_inactive()
super(Inventory, self).mark_inactive(save=save) super(Inventory, self).mark_inactive(save=save)
@@ -352,22 +352,27 @@ class Group(CommonModelNameNotUnique):
def get_absolute_url(self): def get_absolute_url(self):
return reverse('api:group_detail', args=(self.pk,)) return reverse('api:group_detail', args=(self.pk,))
def mark_inactive(self, save=True): def mark_inactive(self, save=True, recompute=True):
''' '''
When marking groups inactive, remove all associations to related When marking groups inactive, remove all associations to related
groups/hosts/inventory_sources. groups/hosts/inventory_sources.
''' '''
from awx.main.signals import ignore_inventory_computed_fields def mark_actual():
i = self.inventory
with ignore_inventory_computed_fields():
super(Group, self).mark_inactive(save=save) super(Group, self).mark_inactive(save=save)
self.inventory_source.mark_inactive(save=save) self.inventory_source.mark_inactive(save=save)
self.inventory_sources.clear() self.inventory_sources.clear()
self.parents.clear() self.parents.clear()
self.children.clear() self.children.clear()
self.hosts.clear() self.hosts.clear()
i.update_computed_fields() from awx.main.signals import ignore_inventory_computed_fields
i = self.inventory
if recompute:
with ignore_inventory_computed_fields():
mark_actual()
i.update_computed_fields()
else:
mark_actual()
def update_computed_fields(self): def update_computed_fields(self):
''' '''