From bbb79f91fb8018757412f7c9542855d8bf711025 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?David=20Barrag=C3=A1n=20Merino?= Date: Thu, 21 Nov 2013 18:45:24 +0100 Subject: [PATCH] Fixed the historical serializer to get the changed fields in the 'addition' version --- greenmine/base/serializers.py | 25 ++++++++++++------------- 1 file changed, 12 insertions(+), 13 deletions(-) diff --git a/greenmine/base/serializers.py b/greenmine/base/serializers.py index aa016ad6..f77bb10b 100644 --- a/greenmine/base/serializers.py +++ b/greenmine/base/serializers.py @@ -59,26 +59,25 @@ class VersionSerializer(serializers.ModelSerializer): try: return versions[versions.index(obj) + 1].field_dict except IndexError: - return None + return {} def get_changed_fields(self, obj): new_fields = self.get_object_fields(obj) old_fields = self.get_object_old_fields(obj) changed_fields = {} - if old_fields: - for key in new_fields.keys() | old_fields.keys(): - if key == "modified_date": - continue + for key in new_fields.keys() | old_fields.keys(): + if key == "modified_date": + continue - if old_fields.get(key, None) == new_fields.get(key, None): - continue + if old_fields.get(key, "") == new_fields.get(key, ""): + continue - changed_fields[key] = { - "name": obj.object.__class__._meta.get_field_by_name( - key)[0].verbose_name, - "old": old_fields.get(key, None), - "new": new_fields.get(key, None), - } + changed_fields[key] = { + "name": obj.object.__class__._meta.get_field_by_name( + key)[0].verbose_name, + "old": old_fields.get(key, None), + "new": new_fields.get(key, None), + } return changed_fields