From 3a2f5d136285ca8fd402544570ececce93d6aae2 Mon Sep 17 00:00:00 2001 From: Akita Noek Date: Wed, 20 Apr 2016 16:58:40 -0400 Subject: [PATCH] Update BaseSerializer to handle objects that dont have created/modified fields --- awx/api/serializers.py | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/awx/api/serializers.py b/awx/api/serializers.py index 3da45dc70d..0382e6d549 100644 --- a/awx/api/serializers.py +++ b/awx/api/serializers.py @@ -340,16 +340,18 @@ class BaseSerializer(serializers.ModelSerializer): return None elif isinstance(obj, User): return obj.date_joined - else: + elif hasattr(obj, 'created'): return obj.created + return None def get_modified(self, obj): if obj is None: return None elif isinstance(obj, User): return obj.last_login # Not actually exposed for User. - else: + elif hasattr(obj, 'modified'): return obj.modified + return None def build_standard_field(self, field_name, model_field): # DRF 3.3 serializers.py::build_standard_field() -> utils/field_mapping.py::get_field_kwargs() short circuits