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

Add survey bits to summary fields on job templates.... change "title" to

Browse Source 
"name" on survey metadata.
This commit is contained in:
Matthew Jones
2014-09-22 11:10:33 -04:00
parent 36ab9d98e0
commit 259e48df3e
2 changed files with 8 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
awx/api/serializers.py
View File

@@ -1244,6 +1244,12 @@ class JobTemplateSerializer(UnifiedJobTemplateSerializer, JobOptionsSerializer):
res['survey_spec'] = reverse('api:job_template_survey_spec', args=(obj.pk,)) res['survey_spec'] = reverse('api:job_template_survey_spec', args=(obj.pk,))
return res return res
def get_summary_fields(self, obj):
d = super(JobTemplateSerializer, self).get_summary_fields(obj)
if obj.survey_enabled and ('name' in obj.survey_spec and 'description' in obj.survey_spec):
d['survey'] = dict(title=obj.survey_spec['name'], description=obj.survey_spec['description'])
return d
class JobSerializer(UnifiedJobSerializer, JobOptionsSerializer): class JobSerializer(UnifiedJobSerializer, JobOptionsSerializer):

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

@@ -233,8 +233,8 @@ class JobTemplate(UnifiedJobTemplate, JobOptions):
errors = [] errors = []
if not self.survey_enabled: if not self.survey_enabled:
return errors return errors
if 'title' not in self.survey_spec: if 'name' not in self.survey_spec:
errors.append("'title' missing from survey spec") errors.append("'name' missing from survey spec")
if 'description' not in self.survey_spec: if 'description' not in self.survey_spec:
errors.append("'description' missing from survey spec") errors.append("'description' missing from survey spec")
for survey_element in self.survey_spec["spec"]: for survey_element in self.survey_spec["spec"]: