Merge pull request #168 from chrismeyersfsu/fix-extra_vars

job template launch handle extra_vars
This commit is contained in:
Chris Meyers
2015-04-28 09:49:29 -04:00
2 changed files with 24 additions and 0 deletions

View File

@@ -1801,6 +1801,9 @@ class JobLaunchSerializer(BaseSerializer):
except (yaml.YAMLError, TypeError, AttributeError):
raise serializers.ValidationError(dict(extra_vars=['Must be valid JSON or YAML']))
if not isinstance(extra_vars, dict):
extra_vars = {}
if self.get_survey_enabled(obj):
validation_errors = obj.survey_variable_validation(extra_vars)
if validation_errors: