From 409b203e9de098235a342e91b3ada82045f90698 Mon Sep 17 00:00:00 2001 From: Guillaume Pellerin Date: Thu, 15 Jan 2015 11:12:28 +0100 Subject: [PATCH] fix return foreignkey unicode --- telemeta/models/media.py | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/telemeta/models/media.py b/telemeta/models/media.py index 810d782b..38620113 100644 --- a/telemeta/models/media.py +++ b/telemeta/models/media.py @@ -360,7 +360,10 @@ class MediaCollection(MediaResource): return get_full_url(reverse('telemeta-collection-detail', kwargs={'public_id':self.pk})) def to_dict_with_more(self): - metadata = model_to_dict(self, fields=[], exclude=self.exclude) + # metadata = model_to_dict(self, fields=[], exclude=self.exclude) + metadata = self.to_dict() + for key in self.exclude: + metadata.remove(key) metadata['url'] = get_full_url(reverse('telemeta-collection-detail', kwargs={'public_id':self.pk})) metadata['doc_status'] = self.document_status() metadata['countries'] = ';'.join([location.name for location in self.main_countries()]) @@ -588,7 +591,10 @@ class MediaItem(MediaResource): return get_full_url(reverse('telemeta-item-detail', kwargs={'public_id':self.pk})) def to_dict_with_more(self): - metadata = model_to_dict(self, fields=[], exclude=self.exclude) + # metadata = model_to_dict(self, fields=[], exclude=self.exclude) + metadata = self.to_dict() + for key in self.exclude: + metadata.remove(key) metadata['url'] = self.get_url() metadata['last_modification_date'] = unicode(self.get_revision().time) metadata['collection'] = self.collection.get_url() -- 2.39.5