diff options
| author | Tom Christie | 2014-12-10 09:27:58 +0000 | 
|---|---|---|
| committer | Tom Christie | 2014-12-10 09:27:58 +0000 | 
| commit | fb313f80983530efcb6e5bbdcff68c98d1e68cc4 (patch) | |
| tree | b26972e75e67374a194de13a52e75b50ed287888 | |
| parent | 81d0b748b400263114422c464f75357e24952ad6 (diff) | |
| parent | 428630c19702172beba94a3381d91340aa5e3bd6 (diff) | |
| download | django-rest-framework-fb313f80983530efcb6e5bbdcff68c98d1e68cc4.tar.bz2 | |
Merge pull request #2241 from IvanAlegre/patch-1
Update serializers.py
| -rw-r--r-- | rest_framework/serializers.py | 4 | 
1 files changed, 3 insertions, 1 deletions
| diff --git a/rest_framework/serializers.py b/rest_framework/serializers.py index b0c0efa7..9226895e 100644 --- a/rest_framework/serializers.py +++ b/rest_framework/serializers.py @@ -517,7 +517,9 @@ class ListSerializer(BaseSerializer):          """          List of object instances -> List of dicts of primitive datatypes.          """ -        iterable = data.all() if (hasattr(data, 'all')) else data +        # 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          return [              self.child.to_representation(item) for item in iterable          ] | 
