External-Mirrors/awx
2
0
Fork 0
mirror of https://github.com/ansible/awx.git synced 2026-07-29 00:49:55 -02:30
Code Issues Packages Projects Releases Wiki Activity

Fix bug where API assumed survey choices were list

Browse Source 
Applies to both single-select and multi-select type questions.
UI sends choices in the form of text with line breaks
separating the options.
Customer complained about empty string erronously sent by
the UI being passed to playbook, which is a component of this.
This commit is contained in:
AlanCoding
2017-04-06 17:32:08 -04:00
parent 915eccd982
commit b9c45ed54a
3 changed files with 51 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
awx/main/models/mixins.py
View File

@@ -1,5 +1,6 @@
# Python
import json
from copy import copy
# Django
from django.db import models
@@ -196,16 +197,22 @@ class SurveyJobTemplateMixin(models.Model):
if type(data[survey_element['variable']]) != list:
errors.append("'%s' value is expected to be a list." % survey_element['variable'])
else:
choice_list = copy(survey_element['choices'])
if isinstance(choice_list, basestring):
choice_list = choice_list.split('\n')
for val in data[survey_element['variable']]:
if val not in survey_element['choices']:
if val not in choice_list:
errors.append("Value %s for '%s' expected to be one of %s." % (val, survey_element['variable'],
survey_element['choices']))
choice_list))
elif survey_element['type'] == 'multiplechoice':
choice_list = copy(survey_element['choices'])
if isinstance(choice_list, basestring):
choice_list = choice_list.split('\n')
if survey_element['variable'] in data:
if data[survey_element['variable']] not in survey_element['choices']:
if data[survey_element['variable']] not in choice_list:
errors.append("Value %s for '%s' expected to be one of %s." % (data[survey_element['variable']],
survey_element['variable'],
survey_element['choices']))
choice_list))
return errors
def survey_variable_validation(self, data):