External-Mirrors/awx
2
0
Fork 0
mirror of https://github.com/ansible/awx.git synced 2026-05-17 22:37:41 -02:30
Code Issues Packages Projects Releases Wiki Activity

Bug fixes from integration ran on launchtime branch

Browse Source 
Make error message for muti-vault validation more
consistent with historical message
This commit is contained in:
AlanCoding
2017-12-07 13:37:28 -05:00
parent 72a8854c27
commit 1c8217936d
11 changed files with 38 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -99,10 +99,11 @@ class Schedule(CommonModel, LaunchTimeConfig):
def get_job_kwargs(self):
config_data = self.prompts_dict()
prompts, rejected, errors = self.unified_job_template._accept_or_ignore_job_kwargs(**config_data)
job_kwargs, rejected, errors = self.unified_job_template._accept_or_ignore_job_kwargs(**config_data)
if errors:
logger.info('Errors creating scheduled job: {}'.format(errors))
return prompts
job_kwargs['_eager_fields'] = {'launch_type': 'scheduled', 'schedule': self}
return job_kwargs
def update_computed_fields(self):
future_rs = dateutil.rrule.rrulestr(self.rrule, forceset=True)