Merge pull request #1586 from wwitzel3/devel

Moved RelatedJobMixin impl to Project instead of ProjectUpdate

awx/main/models/jobs.py

@@ -456,7 +456,7 @@ class JobTemplate(UnifiedJobTemplate, JobOptions, SurveyJobTemplateMixin, Resour
     RelatedJobsMixin
     '''
     def _get_active_jobs(self):
-        return Job.objects.filter(status__in=ACTIVE_STATES)
+        return Job.objects.filter(status__in=ACTIVE_STATES, job_template=self)
 
 
 class Job(UnifiedJob, JobOptions, SurveyJobMixin, JobNotificationMixin, TaskManagerJobMixin):

awx/main/models/projects.py

@@ -25,7 +25,11 @@ from awx.main.models.notifications import (
     NotificationTemplate,
     JobNotificationMixin,
 )
-from awx.main.models.unified_jobs import * # noqa
+from awx.main.models.unified_jobs import (
+    UnifiedJob,
+    UnifiedJobTemplate,
+    ACTIVE_STATES,
+)
 from awx.main.models.mixins import (
     ResourceMixin,
     TaskManagerProjectUpdateMixin,
@@ -230,7 +234,7 @@ class ProjectOptions(models.Model):
         return proj_path + '.lock'
 
 
-class Project(UnifiedJobTemplate, ProjectOptions, ResourceMixin, CustomVirtualEnvMixin):
+class Project(UnifiedJobTemplate, ProjectOptions, ResourceMixin, CustomVirtualEnvMixin, RelatedJobsMixin):
     '''
     A project represents a playbook git repo that can access a set of inventories
     '''
@@ -447,8 +451,21 @@ class Project(UnifiedJobTemplate, ProjectOptions, ResourceMixin, CustomVirtualEn
     def get_absolute_url(self, request=None):
         return reverse('api:project_detail', kwargs={'pk': self.pk}, request=request)
 
+    '''
+    RelatedJobsMixin
+    '''
+    def _get_active_jobs(self):
+        return UnifiedJob.objects.non_polymorphic().filter(
+            models.Q(status__in=ACTIVE_STATES) &
+            (
+                models.Q(Job___project=self) |
+                models.Q(ProjectUpdate___project=self)
+            )
+        )
 
-class ProjectUpdate(UnifiedJob, ProjectOptions, JobNotificationMixin, TaskManagerProjectUpdateMixin, RelatedJobsMixin):
+
+
+class ProjectUpdate(UnifiedJob, ProjectOptions, JobNotificationMixin, TaskManagerProjectUpdateMixin):
     '''
     Internal job for tracking project updates from SCM.
     '''
@@ -563,15 +580,4 @@ class ProjectUpdate(UnifiedJob, ProjectOptions, JobNotificationMixin, TaskManage
             return self.global_instance_groups
         return selected_groups
 
-    '''
-    RelatedJobsMixin
-    '''
-    def _get_active_jobs(self):
-        return UnifiedJob.objects.non_polymorphic().filter(
-            Q(status__in=ACTIVE_STATES) &
-            (
-                Q(Job___project=self) |
-                Q(ProjectUpdate___project=self)
-            )
-        )
 

awx/main/models/workflow.py

@@ -415,7 +415,7 @@ class WorkflowJobTemplate(UnifiedJobTemplate, WorkflowJobOptions, SurveyJobTempl
     RelatedJobsMixin
     '''
     def _get_active_jobs(self):
-        return WorkflowJob.objects.filter(status__in=ACTIVE_STATES)
+        return WorkflowJob.objects.filter(status__in=ACTIVE_STATES, workflow_job_template=self)
 
 
 class WorkflowJob(UnifiedJob, WorkflowJobOptions, SurveyJobMixin, JobNotificationMixin):

awx/main/tests/functional/test_projects.py

@@ -251,3 +251,10 @@ def test_project_unique_together_with_org(organization):
         proj2.validate_unique()
     proj2 = Project(name='foo', organization=None)
     proj2.validate_unique()
+
+
+@pytest.mark.django_db
+def test_project_delete(delete, organization, admin_user):
+    proj = Project(name='foo', organization=organization)
+    proj.save()
+    delete(reverse('api:project_detail', kwargs={'pk':proj.id,}), admin_user)