zware/awx
1
0
Fork 0
mirror of https://github.com/ZwareBear/awx.git synced 2026-04-30 11:51:48 -05:00
Code Issues Packages Projects Releases Wiki Activity

block deletion of resources w unprocessed events

Browse Source
This commit is contained in:
AlanCoding
2018-03-15 15:56:52 -04:00
parent 16aa3d724f
commit 7881c921ac
9 changed files with 89 additions and 47 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -33,7 +33,6 @@ from awx.main.managers import HostManager
from awx.main.models.base import * # noqa
from awx.main.models.events import InventoryUpdateEvent
from awx.main.models.unified_jobs import * # noqa
from awx.main.models.unified_jobs import ACTIVE_STATES
from awx.main.models.mixins import (
ResourceMixin,
TaskManagerInventoryUpdateMixin,
@@ -497,14 +496,11 @@ class Inventory(CommonModelNameNotUnique, ResourceMixin, RelatedJobsMixin):
'''
RelatedJobsMixin
'''
def _get_active_jobs(self):
def _get_related_jobs(self):
return UnifiedJob.objects.non_polymorphic().filter(
Q(status__in=ACTIVE_STATES) &
(
Q(Job___inventory=self) |
Q(InventoryUpdate___inventory_source__inventory=self) |
Q(AdHocCommand___inventory=self)
)
Q(Job___inventory=self) |
Q(InventoryUpdate___inventory_source__inventory=self) |
Q(AdHocCommand___inventory=self)
)
@@ -963,9 +959,8 @@ class Group(CommonModelNameNotUnique, RelatedJobsMixin):
'''
RelatedJobsMixin
'''
def _get_active_jobs(self):
return InventoryUpdate.objects.filter(status__in=ACTIVE_STATES,
inventory_source__in=self.inventory_sources.all())
def _get_related_jobs(self):
return InventoryUpdate.objects.filter(inventory_source__in=self.inventory_sources.all())
class InventorySourceOptions(BaseModel):
@@ -1583,9 +1578,8 @@ class InventorySource(UnifiedJobTemplate, InventorySourceOptions, RelatedJobsMix
'''
RelatedJobsMixin
'''
def _get_active_jobs(self):
return InventoryUpdate.objects.filter(status__in=ACTIVE_STATES,
inventory_source=self)
def _get_related_jobs(self):
return InventoryUpdate.objects.filter(inventory_source=self)
class InventoryUpdate(UnifiedJob, InventorySourceOptions, JobNotificationMixin, TaskManagerInventoryUpdateMixin):