encode/django-rest-framework
1
1
Fork 0
mirror of https://github.com/encode/django-rest-framework.git synced 2025-04-25 19:43:47 +03:00
Code Issues Packages Projects Releases Wiki Activity

Use select inputs for relationships. Closes #2058.

Browse Source
This commit is contained in:
Tom Christie 2014-11-13 19:35:03 +00:00
parent ea98de9b88
commit fd97d9bff8
2 changed files with 10 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
rest_framework/relations.py
View File

@ -34,13 +34,13 @@ class RelatedField(Field):
def __new__(cls, *args, **kwargs): def __new__(cls, *args, **kwargs):
# We override this method in order to automagically create # We override this method in order to automagically create
# `ManyRelation` classes instead when `many=True` is set. # `ManyRelatedField` classes instead when `many=True` is set.
if kwargs.pop('many', False): if kwargs.pop('many', False):
list_kwargs = {'child_relation': cls(*args, **kwargs)} list_kwargs = {'child_relation': cls(*args, **kwargs)}
for key in kwargs.keys(): for key in kwargs.keys():
if key in MANY_RELATION_KWARGS: if key in MANY_RELATION_KWARGS:
list_kwargs[key] = kwargs[key] list_kwargs[key] = kwargs[key]
return ManyRelation(**list_kwargs) return ManyRelatedField(**list_kwargs)
return super(RelatedField, cls).__new__(cls, *args, **kwargs) return super(RelatedField, cls).__new__(cls, *args, **kwargs)
def run_validation(self, data=empty): def run_validation(self, data=empty):
@ -286,12 +286,12 @@ class SlugRelatedField(RelatedField):
return getattr(obj, self.slug_field) return getattr(obj, self.slug_field)
class ManyRelation(Field): class ManyRelatedField(Field):
""" """
Relationships with `many=True` transparently get coerced into instead being Relationships with `many=True` transparently get coerced into instead being
a ManyRelation with a child relationship. a ManyRelatedField with a child relationship.
The `ManyRelation` class is responsible for handling iterating through The `ManyRelatedField` class is responsible for handling iterating through
the values and passing each one to the child relationship. the values and passing each one to the child relationship.
You shouldn't need to be using this class directly yourself. You shouldn't need to be using this class directly yourself.
@ -302,7 +302,7 @@ class ManyRelation(Field):
def __init__(self, child_relation=None, *args, **kwargs): def __init__(self, child_relation=None, *args, **kwargs):
self.child_relation = child_relation self.child_relation = child_relation
assert child_relation is not None, '`child_relation` is a required argument.' assert child_relation is not None, '`child_relation` is a required argument.'
super(ManyRelation, self).__init__(*args, **kwargs) super(ManyRelatedField, self).__init__(*args, **kwargs)
self.child_relation.bind(field_name='', parent=self) self.child_relation.bind(field_name='', parent=self)
def get_value(self, dictionary): def get_value(self, dictionary):

5
rest_framework/renderers.py
View File

@ -383,7 +383,10 @@ class HTMLFormRenderer(BaseRenderer):
serializers.MultipleChoiceField: { serializers.MultipleChoiceField: {
'base_template': 'select_multiple.html', # Also valid: 'checkbox_multiple.html' 'base_template': 'select_multiple.html', # Also valid: 'checkbox_multiple.html'
}, },
serializers.ManyRelation: { serializers.RelatedField: {
'base_template': 'select.html', # Also valid: 'radio.html'
},
serializers.ManyRelatedField: {
'base_template': 'select_multiple.html', # Also valid: 'checkbox_multiple.html' 'base_template': 'select_multiple.html', # Also valid: 'checkbox_multiple.html'
}, },
serializers.Serializer: { serializers.Serializer: {