fix return foreignkey unicode

diff --git a/telemeta/models/media.py b/telemeta/models/media.py
index 810d782ba58df986f90b395e841d627658c6c828..38620113b1fae11efe8f4a77c0cc892aaef096c8 100644 (file)
--- 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()