Merge pull request #3215 from AlanCoding/2200_job_survey_pass

Save survey passwords in job as new field
This commit is contained in:
Alan Rominger
2016-08-12 14:04:29 -04:00
committed by GitHub
12 changed files with 135 additions and 29 deletions

View File

@@ -1981,7 +1981,7 @@ class JobSerializer(UnifiedJobSerializer, JobOptionsSerializer):
return ret
if 'job_template' in ret and not obj.job_template:
ret['job_template'] = None
if obj.job_template and obj.job_template.survey_enabled and 'extra_vars' in ret:
if 'extra_vars' in ret:
ret['extra_vars'] = obj.display_extra_vars()
return ret