Limit queryset when rendering relational choices. (#4375)

tomchristie · web-flow · commit 2d43b17f9a85 · 2016-08-10T13:01:10.000+01:00
Limit querysets to html_cutoff when rendering relational choices
diff --git a/rest_framework/relations.py b/rest_framework/relations.py
@@ -156,14 +156,16 @@ def get_attribute(self, instance):
         # Standard case, return the object instance.
         return get_attribute(instance, self.source_attrs)
 
-    @property
-    def choices(self):
+    def get_choices(self, cutoff=None):
         queryset = self.get_queryset()
         if queryset is None:
             # Ensure that field.choices returns something sensible
             # even when accessed with a read-only field.
             return {}
 
+        if cutoff is not None:
+            queryset = queryset[:cutoff]
+
         return OrderedDict([
             (
                 six.text_type(self.to_representation(item)),
@@ -172,13 +174,17 @@ def choices(self):
             for item in queryset
         ])
 
+    @property
+    def choices(self):
+        return self.get_choices()
+
     @property
     def grouped_choices(self):
         return self.choices
 
     def iter_options(self):
         return iter_options(
-            self.grouped_choices,
+            self.get_choices(cutoff=self.html_cutoff),
             cutoff=self.html_cutoff,
             cutoff_text=self.html_cutoff_text
         )
@@ -487,17 +493,20 @@ def to_representation(self, iterable):
             for value in iterable
         ]
 
+    def get_choices(self, cutoff=None):
+        return self.child_relation.get_choices(cutoff)
+
     @property
     def choices(self):
-        return self.child_relation.choices
+        return self.get_choices()
 
     @property
     def grouped_choices(self):
         return self.choices
 
     def iter_options(self):
         return iter_options(
-            self.grouped_choices,
+            self.get_choices(cutoff=self.html_cutoff),
             cutoff=self.html_cutoff,
             cutoff_text=self.html_cutoff_text
         )
