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

Merge pull request #1823 from AlanCoding/532_survey_validation

Browse Source 
Block Duplicate Survey Variables
This commit is contained in:
Alan Rominger
2016-05-10 13:35:57 -04:00
parent c7612caa7d fe1a0e2aa8
commit ac24fc75b8
3 changed files with 140 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
awx/api/views.py
View File

@@ -2229,6 +2229,7 @@ class JobTemplateSurveySpec(GenericAPIView):
if len(obj.survey_spec["spec"]) < 1:
return Response(dict(error="'spec' doesn't contain any items"), status=status.HTTP_400_BAD_REQUEST)
idx = 0
variable_set = set()
for survey_item in obj.survey_spec["spec"]:
if not isinstance(survey_item, dict):
return Response(dict(error="survey element %s is not a json object" % str(idx)), status=status.HTTP_400_BAD_REQUEST)
@@ -2238,6 +2239,10 @@ class JobTemplateSurveySpec(GenericAPIView):
return Response(dict(error="'question_name' missing from survey element %s" % str(idx)), status=status.HTTP_400_BAD_REQUEST)
if "variable" not in survey_item:
return Response(dict(error="'variable' missing from survey element %s" % str(idx)), status=status.HTTP_400_BAD_REQUEST)
if survey_item['variable'] in variable_set:
return Response(dict(error="'variable' name '%s' duplicated in survey element %s" % (survey_item['variable'], str(idx))), status=status.HTTP_400_BAD_REQUEST)
else:
variable_set.add(survey_item['variable'])
if "required" not in survey_item:
return Response(dict(error="'required' missing from survey element %s" % str(idx)), status=status.HTTP_400_BAD_REQUEST)
idx += 1