From 26f3019aa12724a8e72eb12a26c23a762698ea08 Mon Sep 17 00:00:00 2001 From: Kirill Pavlov Date: Mon, 18 May 2015 04:42:51 +0000 Subject: [PATCH 1/3] update serializer, allow to serialize fields not defined in model, but in resource. --- jsonapi/serializers.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/jsonapi/serializers.py b/jsonapi/serializers.py index 1382a32..9d39e6a 100644 --- a/jsonapi/serializers.py +++ b/jsonapi/serializers.py @@ -99,18 +99,18 @@ def dump_document(cls, instance, fields_own=None, fields_to_many=None): document = {} # Include own fields for fieldname in fields_own: - value = getattr(instance, fieldname) field_serializer = getattr( cls, "dump_document_{}".format(fieldname), None) if field_serializer is not None: value = field_serializer(instance) else: + value = getattr(instance, fieldname) try: field = instance._meta.get_field(fieldname) except models.fields.FieldDoesNotExist: - # Field is property - value = getattr(instance, fieldname) + # Field is property, value already calculated + pass else: if isinstance(field, models.fields.files.FileField): # TODO: Serializer depends on API here. From 7a12e9a32d16462c474a476d6f47fba5ca18019e Mon Sep 17 00:00:00 2001 From: Kirill Pavlov Date: Mon, 18 May 2015 04:44:01 +0000 Subject: [PATCH 2/3] update changelog --- ChangeLog | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/ChangeLog b/ChangeLog index dff3d94..738d29a 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +2015-05-18 Kirill Pavlov + + * Allow serialization of fields not defined in model, but in resource. + 2015-04-20 Kirill Pavlov * Add request logger. From 460e535c44b911ba943b55c5f679d2be3a3fde57 Mon Sep 17 00:00:00 2001 From: Kirill Pavlov Date: Mon, 18 May 2015 04:44:07 +0000 Subject: [PATCH 3/3] update version --- jsonapi/__init__.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/jsonapi/__init__.py b/jsonapi/__init__.py index aaca2dd..73310ff 100644 --- a/jsonapi/__init__.py +++ b/jsonapi/__init__.py @@ -1,5 +1,5 @@ """ JSON:API realization.""" -__version = (0, 8, 7) +__version = (0, 8, 8) __version__ = version = '.'.join(map(str, __version)) __project__ = PROJECT = __name__