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

Merge pull request #8326 from wenottingham/param-a-lot

Browse Source 
Fix 500 when required LDAP group parameters aren't set.

Reviewed-by: https://github.com/apps/softwarefactory-project-zuul
This commit is contained in:
softwarefactory-project-zuul[bot]
2020-10-12 15:58:27 +00:00
committed by GitHub
parent 119c907279 bc22fa56dc
commit 49c0b77c60
1 changed files with 5 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
awx/sso/fields.py
View File

@@ -445,6 +445,7 @@ class LDAPGroupTypeField(fields.ChoiceField, DependsOnMixin):
default_error_messages = { default_error_messages = {
'type_error': _('Expected an instance of LDAPGroupType but got {input_type} instead.'), 'type_error': _('Expected an instance of LDAPGroupType but got {input_type} instead.'),
'missing_parameters': _('Missing required parameters in {dependency}.')
} }
def __init__(self, choices=None, **kwargs): def __init__(self, choices=None, **kwargs):
@@ -479,7 +480,10 @@ class LDAPGroupTypeField(fields.ChoiceField, DependsOnMixin):
if attr in params: if attr in params:
params_sanitized[attr] = params[attr] params_sanitized[attr] = params[attr]
return cls(**params_sanitized) try:
return cls(**params_sanitized)
except TypeError:
self.fail('missing_parameters', dependency=list(self.depends_on)[0])
class LDAPGroupTypeParamsField(fields.DictField, DependsOnMixin): class LDAPGroupTypeParamsField(fields.DictField, DependsOnMixin):