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

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

Browse Source
This commit is contained in:
Matthew Jones
2014-04-17 10:14:47 -04:00
parent a49c627e53
commit f06dde4fa3
2 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
awx/main/models/schedules.py
View File

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

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

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