External-Mirrors/awx
2
0
Fork 0
mirror of https://github.com/ansible/awx.git synced 2026-03-20 18:37:39 -02:30
Code Issues Packages Projects Releases Wiki Activity

Remove old method of appending errors because it makes attrs None, causing server errors

Browse Source
This commit is contained in:
AlanCoding
2016-07-11 11:27:08 -04:00
parent fbde6355bf
commit 3e433dc9f3
1 changed files with 3 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
awx/api/serializers.py
View File

@@ -1926,12 +1926,11 @@ class JobSerializer(UnifiedJobSerializer, JobOptionsSerializer):
def to_internal_value(self, data): def to_internal_value(self, data):
# When creating a new job and a job template is specified, populate any # When creating a new job and a job template is specified, populate any
# fields not provided in data from the job template. # fields not provided in data from the job template.
if not self.instance and isinstance(data, dict) and 'job_template' in data: if not self.instance and isinstance(data, dict) and data.get('job_template', False):
try: try:
job_template = JobTemplate.objects.get(pk=data['job_template']) job_template = JobTemplate.objects.get(pk=data['job_template'])
except JobTemplate.DoesNotExist: except JobTemplate.DoesNotExist:
self._errors = {'job_template': 'Invalid job template.'} raise serializers.ValidationError({'job_template': 'Invalid job template.'})
return
data.setdefault('name', job_template.name) data.setdefault('name', job_template.name)
data.setdefault('description', job_template.description) data.setdefault('description', job_template.description)
data.setdefault('job_type', job_template.job_type) data.setdefault('job_type', job_template.job_type)
@@ -2694,8 +2693,7 @@ class TowerSettingsSerializer(BaseSerializer):
def to_internal_value(self, data): def to_internal_value(self, data):
if data['key'] not in settings.TOWER_SETTINGS_MANIFEST: if data['key'] not in settings.TOWER_SETTINGS_MANIFEST:
self._errors = {'key': 'Key {0} is not a valid settings key.'.format(data['key'])} raise serializers.ValidationError({'key': ['Key {0} is not a valid settings key.'.format(data['key'])]})
return
ret = super(TowerSettingsSerializer, self).to_internal_value(data) ret = super(TowerSettingsSerializer, self).to_internal_value(data)
manifest_val = settings.TOWER_SETTINGS_MANIFEST[data['key']] manifest_val = settings.TOWER_SETTINGS_MANIFEST[data['key']]
ret['description'] = manifest_val['description'] ret['description'] = manifest_val['description']