External-Mirrors/awx
2
0
Fork 0
mirror of https://github.com/ansible/awx.git synced 2026-03-07 11:41:08 -03:30
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #385 from AlanCoding/devel

Browse Source 
add whitespace in API responses about survey rejection
This commit is contained in:
Matthew Jones
2015-08-28 17:06:54 -04:00
parent 553a3c5af3 97c089a521
commit 7d2eec0974
1 changed files with 5 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
awx/main/models/jobs.py
View File

@@ -240,7 +240,7 @@ class JobTemplate(UnifiedJobTemplate, JobOptions):
errors.append("'%s' value %s is too small (must be at least %s)" % errors.append("'%s' value %s is too small (must be at least %s)" %
(survey_element['variable'], data[survey_element['variable']], survey_element['min'])) (survey_element['variable'], data[survey_element['variable']], survey_element['min']))
if 'max' in survey_element and survey_element['max'] not in ["", None] and len(data[survey_element['variable']]) > survey_element['max']: if 'max' in survey_element and survey_element['max'] not in ["", None] and len(data[survey_element['variable']]) > survey_element['max']:
errors.append("'%s' value %s is too large (must be no more than%s)" % errors.append("'%s' value %s is too large (must be no more than %s)" %
(survey_element['variable'], data[survey_element['variable']], survey_element['max'])) (survey_element['variable'], data[survey_element['variable']], survey_element['max']))
elif survey_element['type'] == 'integer': elif survey_element['type'] == 'integer':
if survey_element['variable'] in data: if survey_element['variable'] in data:
@@ -250,7 +250,7 @@ class JobTemplate(UnifiedJobTemplate, JobOptions):
(survey_element['variable'], data[survey_element['variable']], survey_element['min'])) (survey_element['variable'], data[survey_element['variable']], survey_element['min']))
if 'max' in survey_element and survey_element['max'] not in ["", None] and survey_element['variable'] in data and \ if 'max' in survey_element and survey_element['max'] not in ["", None] and survey_element['variable'] in data and \
data[survey_element['variable']] > survey_element['max']: data[survey_element['variable']] > survey_element['max']:
errors.append("'%s' value %s is too large (must be no more than%s)" % errors.append("'%s' value %s is too large (must be no more than %s)" %
(survey_element['variable'], data[survey_element['variable']], survey_element['max'])) (survey_element['variable'], data[survey_element['variable']], survey_element['max']))
if type(data[survey_element['variable']]) != int: if type(data[survey_element['variable']]) != int:
errors.append("Value %s for %s expected to be an integer" % (data[survey_element['variable']], errors.append("Value %s for %s expected to be an integer" % (data[survey_element['variable']],
@@ -261,7 +261,7 @@ class JobTemplate(UnifiedJobTemplate, JobOptions):
errors.append("'%s' value %s is too small (must be at least %s)" % errors.append("'%s' value %s is too small (must be at least %s)" %
(survey_element['variable'], data[survey_element['variable']], survey_element['min'])) (survey_element['variable'], data[survey_element['variable']], survey_element['min']))
if 'max' in survey_element and survey_element['max'] not in ["", None] and data[survey_element['variable']] > survey_element['max']: if 'max' in survey_element and survey_element['max'] not in ["", None] and data[survey_element['variable']] > survey_element['max']:
errors.append("'%s' value %s is too large (must be no more than%s)" % errors.append("'%s' value %s is too large (must be no more than %s)" %
(survey_element['variable'], data[survey_element['variable']], survey_element['max'])) (survey_element['variable'], data[survey_element['variable']], survey_element['max']))
if type(data[survey_element['variable']]) not in (float, int): if type(data[survey_element['variable']]) not in (float, int):
errors.append("Value %s for %s expected to be a numeric type" % (data[survey_element['variable']], errors.append("Value %s for %s expected to be a numeric type" % (data[survey_element['variable']],
@@ -282,7 +282,7 @@ class JobTemplate(UnifiedJobTemplate, JobOptions):
survey_element['variable'], survey_element['variable'],
survey_element['choices'])) survey_element['choices']))
return errors return errors
def _update_unified_job_kwargs(self, **kwargs): def _update_unified_job_kwargs(self, **kwargs):
if 'launch_type' in kwargs and kwargs['launch_type'] == 'relaunch': if 'launch_type' in kwargs and kwargs['launch_type'] == 'relaunch':
return kwargs return kwargs
@@ -859,7 +859,7 @@ class JobEvent(CreatedModifiedModel):
try: try:
failures_dict = self.event_data.get('failures', {}) failures_dict = self.event_data.get('failures', {})
dark_dict = self.event_data.get('dark', {}) dark_dict = self.event_data.get('dark', {})
self.failed = bool(sum(failures_dict.values()) + self.failed = bool(sum(failures_dict.values()) +
sum(dark_dict.values())) sum(dark_dict.values()))
if 'failed' not in update_fields: if 'failed' not in update_fields:
update_fields.append('failed') update_fields.append('failed')
@@ -1085,4 +1085,3 @@ class SystemJob(UnifiedJob, SystemJobOptions):
@property @property
def task_impact(self): def task_impact(self):
return 150 return 150