Merge pull request #6995 from wwitzel3/devel

Swap delay/save calls for schedule_deletion
This commit is contained in:
Wayne Witzel III 2017-07-11 17:01:59 -04:00 committed by GitHub
commit 40fcd4240f

View File

@ -379,10 +379,10 @@ class Inventory(CommonModelNameNotUnique, ResourceMixin):
from awx.main.tasks import delete_inventory
if self.pending_deletion is True:
raise RuntimeError("Inventory is already pending deletion.")
self.websocket_emit_status('pending_deletion')
delete_inventory.delay(self.pk)
self.pending_deletion = True
self.save(update_fields=['pending_deletion'])
self.websocket_emit_status('pending_deletion')
delete_inventory.delay(self.pk)
class SmartInventoryMembership(BaseModel):