Fix AC-1202... when marking a schedule as inactive also mark it as disabled. When filtering schedules for what should run make sure we exclude inactive schedules also

awx/main/models/schedules.py

@@ -23,7 +23,7 @@ __all__ = ['Schedule']
 class ScheduleFilterMethods(object):
 
     def enabled(self, enabled=True):
-        return self.filter(enabled=enabled)
+        return self.filter(enabled=enabled, active=enabled)
 
     def before(self, dt):
         return self.filter(next_run__lt=dt)

awx/main/models/unified_jobs.py

@@ -190,6 +190,8 @@ class UnifiedJobTemplate(PolymorphicModel, CommonModelNameNotUnique):
         '''
         for schedule in self.schedules.filter(active=True):
             schedule.mark_inactive()
+            schedule.enabled = False
+            schedule.save()
         super(UnifiedJobTemplate, self).mark_inactive(save=save)
 
     def save(self, *args, **kwargs):
@@ -423,7 +425,7 @@ class UnifiedJob(PolymorphicModel, PasswordFieldsModel, CommonModelNameNotUnique
     @classmethod
     def _get_task_class(cls):
         raise NotImplementedError # Implement in subclasses.
-    
+
     @classmethod
     def _get_parent_field_name(cls):
         return 'unified_job_template' # Override in subclasses.