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

Merge pull request #6995 from wwitzel3/devel

Browse Source 
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
parent 40aac68402 0ab5124b80
commit 40fcd4240f
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

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