update model

diff --git a/app/festival/models.py b/app/festival/models.py
index fe86abbf527e7f01af68617fd0f56e7f965ab87d..c7fe39b59a8af1c733ff8bc7ed745783b8a0b987 100644 (file)
--- a/app/festival/models.py
+++ b/app/festival/models.py
@@ -51,7 +51,7 @@ class FestivalEvent(models.Model):
 
     event = models.ForeignKey(Event, related_name='festival_events', verbose_name=_('festival event'), blank=True, null=True, on_delete=models.SET_NULL)
     #eve_event = SpanningForeignKey(eve.models.EventVersion, related_name='festival_events', verbose_name=_('E-venement event'), blank=True, null=True, default=None)
-    eve_event_id = models.IntegerField(_('eve id'), blank=True)
+    eve_event_id = models.IntegerField(_('eve id'), blank=True, null=True)
     category = models.ForeignKey('EventCategory', related_name='festival_events', verbose_name=_('category'), blank=True, null=True, on_delete=models.SET_NULL)
     artists = models.ManyToManyField('Artist', related_name='metaevents', verbose_name=_('artists'), blank=True)
     featured = models.BooleanField(_('featured'), default=False)
@@ -100,7 +100,7 @@ class Video(Displayable, RichText):
     """Video"""
 
     event = models.ForeignKey(Event, related_name='videos', verbose_name=_('event'), blank=True, null=True, on_delete=models.SET_NULL)
-    media_id = models.IntegerField(_('media id'))
+    media_id = models.CharField(_('media id'), max_length=128)
 
     class Meta(MetaCore):
         verbose_name = _('video')
@@ -114,7 +114,6 @@ class Video(Displayable, RichText):
         #TODO: get html content from medias.ircam.fr with request module
         pass
 
-    @models.permalink
     def get_absolute_url(self):
         return reverse("festival-video-detail", kwargs={"slug": self.slug})
 

diff --git a/app/festival/templates/festival/video_detail.html b/app/festival/templates/festival/video_detail.html
index 5a2cde49c74033892abd17c88db0fd9532e9778c..4bc5f156a8398b6464e351cced18da33d8e690cb 100644 (file)
--- a/app/festival/templates/festival/video_detail.html
+++ b/app/festival/templates/festival/video_detail.html
@@ -12,11 +12,14 @@
 </div>
 
 <div class="video-html">
-  {{ video.html|safe }}
+  {{ video.content|safe }}
 </div>
 
+<iframe width="480" height="360" src="http://medias.ircam.fr/embed/media/{{ video.media_id }}" frameborder="0" allowfullscreen=""></iframe>
+
 <div class="video-event">
   <h2>{% trans 'Related event' %}</h2>
-    {{ video.event.title }}
+    <a href="{% url 'festival-event-detail' video.event.slug %}"{{ video.event.title }}</a>
 </div>
+
 {% endblock %}