]> git.parisson.com Git - teleforma.git/commitdiff
again
authorGuillaume Pellerin <yomguy@parisson.com>
Mon, 16 Sep 2013 12:49:04 +0000 (14:49 +0200)
committerGuillaume Pellerin <yomguy@parisson.com>
Mon, 16 Sep 2013 12:49:04 +0000 (14:49 +0200)
teleforma/models/core.py
teleforma/views/core.py

index 0b79340fd45a96ef477a3a05d0fe485d32070c12..5d589eda720ce2879f08b48dc76bc2fab8cd9512 100644 (file)
@@ -609,7 +609,7 @@ class Media(MediaBase):
         url = ''
         for related in self.item.related.all():
             if 'preview' in related.title:
-                url = sorl_default.backend.get_thumbnail(related.file, geometry)
+                url = sorl_default.backend.get_thumbnail(related.file, geometry).url
         return url
 
     class Meta(MetaCore):
index 55af72dc4fdaad255197e4748eca29cc4612369a..6b20fb150423dd59e3452d5b933754025656fc30 100644 (file)
@@ -302,7 +302,7 @@ class CourseView(CourseAccessMixin, DetailView):
                 urls = [ {'url': settings.MEDIA_URL + unicode(media.item.file), 'mime_type': media.mime_type} ]
                 for transcoded in media.item.transcoded.all():
                     urls.append({'url':settings.MEDIA_URL + unicode(transcoded.file), 'mime_type': media.mime_type})
-                media_list.append({'session': media.conference.session, 'urls': urls, 'poster': media.poster_url().url})
+                media_list.append({'session': media.conference.session, 'urls': urls, 'poster': media.poster_url()})
         return media_list