External-Mirrors/awx
2
0
Fork 0
mirror of https://github.com/ansible/awx.git synced 2026-03-11 22:49:32 -02:30
Code Issues Packages Projects Releases Wiki Activity

custom message for JSONschema type error

Browse Source
This commit is contained in:
AlanCoding
2018-04-03 10:16:34 -04:00
parent 9677a9841c
commit ee8416140a
1 changed files with 11 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
awx/main/fields.py
View File

@@ -391,7 +391,15 @@ class JSONSchemaField(JSONBField):
error.message = re.sub(r'\bu(\'|")', r'\1', error.message) error.message = re.sub(r'\bu(\'|")', r'\1', error.message)
if error.validator == 'pattern' and 'error' in error.schema: if error.validator == 'pattern' and 'error' in error.schema:
error.message = error.schema['error'] % error.instance error.message = error.schema['error'].format(instance=error.instance)
elif error.validator == 'type':
expected_type = error.validator_value
if expected_type == 'object':
expected_type = 'dict'
error.message = _(
'{type} provided in relative path {path}, expected {expected_type}'
).format(path=list(error.path), type=type(error.instance).__name__,
expected_type=expected_type)
errors.append(error) errors.append(error)
if errors: if errors:
@@ -523,7 +531,7 @@ class CredentialInputField(JSONSchemaField):
format_checker=self.format_checker format_checker=self.format_checker
).iter_errors(decrypted_values): ).iter_errors(decrypted_values):
if error.validator == 'pattern' and 'error' in error.schema: if error.validator == 'pattern' and 'error' in error.schema:
error.message = error.schema['error'] % error.instance error.message = error.schema['error'].format(instance=error.instance)
if error.validator == 'dependencies': if error.validator == 'dependencies':
# replace the default error messaging w/ a better i18n string # replace the default error messaging w/ a better i18n string
# I wish there was a better way to determine the parameters of # I wish there was a better way to determine the parameters of
@@ -628,7 +636,7 @@ class CredentialTypeInputField(JSONSchemaField):
'id': { 'id': {
'type': 'string', 'type': 'string',
'pattern': '^[a-zA-Z_]+[a-zA-Z0-9_]*$', 'pattern': '^[a-zA-Z_]+[a-zA-Z0-9_]*$',
'error': '%s is an invalid variable name', 'error': '{instance} is an invalid variable name',
}, },
'label': {'type': 'string'}, 'label': {'type': 'string'},
'help_text': {'type': 'string'}, 'help_text': {'type': 'string'},