From f1f73461c52f64cd0a843fe3fc30c2bbfec5603c Mon Sep 17 00:00:00 2001 From: Karl Hobley Date: Mon, 3 Aug 2015 14:12:57 +0100 Subject: [PATCH] Goodbye, get_api_data --- wagtail/contrib/wagtailapi/serializers.py | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/wagtail/contrib/wagtailapi/serializers.py b/wagtail/contrib/wagtailapi/serializers.py index a1680e58e..d7a610b8e 100644 --- a/wagtail/contrib/wagtailapi/serializers.py +++ b/wagtail/contrib/wagtailapi/serializers.py @@ -104,11 +104,6 @@ def get_serializer_class(model, fields): }) -def get_api_data(obj, fields): - serializer_class = get_serializer_class(type(obj), fields) - return serializer_class().to_representation(obj).items() - - class WagtailSerializer(BaseSerializer): def to_representation(self, instance): request = self.context['request'] @@ -168,7 +163,10 @@ class WagtailSerializer(BaseSerializer): # Reorder fields so it matches the order of api_fields fields = [field for field in api_fields if field in fields] - data.extend(get_api_data(obj, fields)) + # Serialize the fields + serializer_class = get_serializer_class(type(obj), fields) + serializer = serializer_class() + data.extend(serializer.to_representation(obj).items()) return OrderedDict(data)