From: Guillaume Pellerin <yomguy@parisson.com>
Date: Thu, 15 Jan 2015 10:12:28 +0000 (+0100)
Subject: fix return foreignkey unicode
X-Git-Tag: 1.5.0rc6~11
X-Git-Url: https://git.parisson.com/?a=commitdiff_plain;h=409b203e9de098235a342e91b3ada82045f90698;p=telemeta.git

fix return foreignkey unicode
---

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()