diff options
| author | Stephan Groß | 2012-12-04 09:40:23 +0100 |
|---|---|---|
| committer | Stephan Groß | 2012-12-04 09:40:23 +0100 |
| commit | e044fa089b5ccdcc3557a65c106fad0f44f1b7b8 (patch) | |
| tree | ed60c5efaf027cd57b9a193e1ce9a01ce692e407 /rest_framework | |
| parent | 3e3ede71d2f4826fa1d07523705dd53ab2cba29a (diff) | |
| download | django-rest-framework-e044fa089b5ccdcc3557a65c106fad0f44f1b7b8.tar.bz2 | |
fixed #469 - RegexField <--> BrowsableAPI Bug
Diffstat (limited to 'rest_framework')
| -rw-r--r-- | rest_framework/fields.py | 1 | ||||
| -rw-r--r-- | rest_framework/renderers.py | 3 |
2 files changed, 4 insertions, 0 deletions
diff --git a/rest_framework/fields.py b/rest_framework/fields.py index 482a3d48..ea0667f5 100644 --- a/rest_framework/fields.py +++ b/rest_framework/fields.py @@ -817,6 +817,7 @@ class EmailField(CharField): class RegexField(CharField): type_name = 'RegexField' + form_field_class = forms.RegexField def __init__(self, regex, max_length=None, min_length=None, *args, **kwargs): super(RegexField, self).__init__(max_length, min_length, *args, **kwargs) diff --git a/rest_framework/renderers.py b/rest_framework/renderers.py index 25a32baa..1220bca1 100644 --- a/rest_framework/renderers.py +++ b/rest_framework/renderers.py @@ -320,6 +320,9 @@ class BrowsableAPIRenderer(BaseRenderer): if getattr(v, 'choices', None) is not None: kwargs['choices'] = v.choices + if getattr(v, 'regex', None) is not None: + kwargs['regex'] = v.regex + if getattr(v, 'widget', None): widget = copy.deepcopy(v.widget) kwargs['widget'] = widget |
