block deletion of resources w unprocessed events

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

View File

@@ -19,10 +19,7 @@ from awx.main.fields import JSONField
from awx.main.models.inventory import InventoryUpdate
from awx.main.models.jobs import Job
from awx.main.models.projects import ProjectUpdate
from awx.main.models.unified_jobs import (
UnifiedJob,
ACTIVE_STATES
)
from awx.main.models.unified_jobs import UnifiedJob
from awx.main.utils import get_cpu_capacity, get_mem_capacity, get_system_task_capacity
from awx.main.models.mixins import RelatedJobsMixin
@@ -159,9 +156,8 @@ class InstanceGroup(models.Model, RelatedJobsMixin):
'''
RelatedJobsMixin
'''
def _get_active_jobs(self):
return UnifiedJob.objects.filter(instance_group=self,
status__in=ACTIVE_STATES)
def _get_related_jobs(self):
return UnifiedJob.objects.filter(instance_group=self)
class Meta: