aboutsummaryrefslogtreecommitdiffstats
path: root/rest_framework
diff options
context:
space:
mode:
authorTom Christie2015-02-26 15:52:54 +0000
committerTom Christie2015-02-26 15:52:54 +0000
commitd219fc0d8179532c17745dd4aaabd38a2f3faa82 (patch)
treeba695e6f5656307efb5efa5fd5d5bf01e4755d4a /rest_framework
parentdafc045c2dc9e1e3b6654438f97bcae0a5aabfa0 (diff)
parent86c5fa240131fe20121db707b0324a32967987ab (diff)
downloaddjango-rest-framework-d219fc0d8179532c17745dd4aaabd38a2f3faa82.tar.bz2
Merge pull request #2602 from dbrgn/fix-1602
List resource not updated between requests
Diffstat (limited to 'rest_framework')
-rw-r--r--rest_framework/serializers.py3
1 files changed, 2 insertions, 1 deletions
diff --git a/rest_framework/serializers.py b/rest_framework/serializers.py
index 9475e119..2eef6eeb 100644
--- a/rest_framework/serializers.py
+++ b/rest_framework/serializers.py
@@ -13,6 +13,7 @@ response content is handled by parsers and renderers.
from __future__ import unicode_literals
from django.db import models
from django.db.models.fields import FieldDoesNotExist, Field as DjangoModelField
+from django.db.models import query
from django.utils.translation import ugettext_lazy as _
from rest_framework.compat import postgres_fields, unicode_to_repr
from rest_framework.utils import model_meta
@@ -562,7 +563,7 @@ class ListSerializer(BaseSerializer):
"""
# Dealing with nested relationships, data can be a Manager,
# so, first get a queryset from the Manager if needed
- iterable = data.all() if isinstance(data, models.Manager) else data
+ iterable = data.all() if isinstance(data, (models.Manager, query.QuerySet)) else data
return [
self.child.to_representation(item) for item in iterable
]