aboutsummaryrefslogtreecommitdiffstats
path: root/rest_framework
diff options
context:
space:
mode:
authorTom Christie2014-12-08 21:56:06 +0000
committerTom Christie2014-12-08 21:56:06 +0000
commit41bfdc0732050d8b630eeae0a9c29a382ea33db5 (patch)
treea69453dcc7b28fc33ca441ed25b6e1b3c50574b0 /rest_framework
parentaf3fe5a39fda7417b99353b2a1c1ee20785cf5a2 (diff)
downloaddjango-rest-framework-41bfdc0732050d8b630eeae0a9c29a382ea33db5.tar.bz2
Don't use 'instance' argument in rendering form for paginated data. Closes #2205.
Diffstat (limited to 'rest_framework')
-rw-r--r--rest_framework/renderers.py5
1 files changed, 5 insertions, 0 deletions
diff --git a/rest_framework/renderers.py b/rest_framework/renderers.py
index 7c14ab8f..cfcf1f5d 100644
--- a/rest_framework/renderers.py
+++ b/rest_framework/renderers.py
@@ -12,6 +12,7 @@ import json
import django
from django import forms
from django.core.exceptions import ImproperlyConfigured
+from django.core.paginator import Page
from django.http.multipartparser import parse_header
from django.template import Context, RequestContext, loader, Template
from django.test.client import encode_multipart
@@ -533,6 +534,8 @@ class BrowsableAPIRenderer(BaseRenderer):
serializer = getattr(data, 'serializer', None)
if serializer and not getattr(serializer, 'many', False):
instance = getattr(serializer, 'instance', None)
+ if isinstance(instance, Page):
+ instance = None
else:
instance = None
@@ -591,6 +594,8 @@ class BrowsableAPIRenderer(BaseRenderer):
serializer = getattr(data, 'serializer', None)
if serializer and not getattr(serializer, 'many', False):
instance = getattr(serializer, 'instance', None)
+ if isinstance(instance, Page):
+ instance = None
else:
instance = None