diff options
| author | Tom Christie | 2014-11-07 10:51:08 +0000 | 
|---|---|---|
| committer | Tom Christie | 2014-11-07 10:51:08 +0000 | 
| commit | e399140031a0738a054f5f07e42ef7208f9e45f4 (patch) | |
| tree | 2624a1672974f9dfc11f4f6b9a699bbea6a0fecb | |
| parent | 555930ee81c21f02fb7f44119a0a35dc4f7c048a (diff) | |
| download | django-rest-framework-e399140031a0738a054f5f07e42ef7208f9e45f4.tar.bz2 | |
Minor tweaks
| -rw-r--r-- | rest_framework/serializers.py | 6 | ||||
| -rw-r--r-- | rest_framework/utils/field_mapping.py | 4 | 
2 files changed, 9 insertions, 1 deletions
| diff --git a/rest_framework/serializers.py b/rest_framework/serializers.py index 68ea27ab..b00f9b7a 100644 --- a/rest_framework/serializers.py +++ b/rest_framework/serializers.py @@ -393,6 +393,9 @@ class ListSerializer(BaseSerializer):          return ReturnList(serializer=self)      def get_value(self, dictionary): +        """ +        Given the input dictionary, return the field value. +        """          # We override the default field access in order to support          # lists in HTML forms.          if html.is_html_input(dictionary): @@ -442,6 +445,9 @@ class ListSerializer(BaseSerializer):          )      def save(self, **kwargs): +        """ +        Save and return a list of object instances. +        """          assert self.instance is None, (              "Serializers do not support multiple update by default, only "              "multiple create. For updates it is unclear how to deal with " diff --git a/rest_framework/utils/field_mapping.py b/rest_framework/utils/field_mapping.py index 6db37146..24639085 100644 --- a/rest_framework/utils/field_mapping.py +++ b/rest_framework/utils/field_mapping.py @@ -219,9 +219,11 @@ def get_relation_kwargs(field_name, relation_info):              kwargs['required'] = False          if model_field.null:              kwargs['allow_null'] = True +        if model_field.validators: +            kwargs['validators'] = model_field.validators          if getattr(model_field, 'unique', False):              validator = UniqueValidator(queryset=model_field.model._default_manager) -            kwargs['validators'] = [validator] +            kwargs['validators'] = kwargs.get('validators', []) + [validator]      return kwargs | 
