From: Guillaume Pellerin <guillaume.pellerin@ircam.fr>
Date: Thu, 16 Aug 2018 14:42:52 +0000 (+0200)
Subject: fix ulrs, temporary DEBUG
X-Git-Tag: 1.3.1~6
X-Git-Url: https://git.parisson.com/?a=commitdiff_plain;h=476881f8c6144ea92ba42529e20921100245d59f;p=teleforma.git

fix ulrs, temporary DEBUG
---

diff --git a/teleforma/urls.py b/teleforma/urls.py
index c9e7aa98..2e723de9 100644
--- a/teleforma/urls.py
+++ b/teleforma/urls.py
@@ -80,8 +80,8 @@ urlpatterns = patterns('',
 
     url(r'^desk/periods/(?P<period_id>.*)/medias/(?P<pk>.*)/detail/$', MediaView.as_view(), name="teleforma-media-detail"),
     url(r'^desk/periods/(?P<period_id>.*)/medias/(?P<pk>.*)/embed/$', MediaViewEmbed.as_view(), name="teleforma-media-embed"),
-    url(r'^desk/periods/(?P<period_id>.*)/medias/(?P<pk>.*)/download/$', MediaDownloadView.as_view(), name="teleforma-media-download"),
-    url(r'^desk/periods/(?P<period_id>.*)/medias/(?P<pk>.*)/streaming/$', MediaStreamingView.as_view(), name="teleforma-media-streaming"),
+    url(r'^desk/periods/(?P<period_id>.*)/medias/(?P<pk>.*)/download/$', MediaView.download(), name="teleforma-media-download"),
+    url(r'^desk/periods/(?P<period_id>.*)/medias/(?P<pk>.*)/streaming/$', MediaView.streaming(), name="teleforma-media-streaming"),
 
     url(r'^desk/documents/(?P<pk>.*)/detail/$', DocumentView.as_view(),
         name="teleforma-document-detail"),
diff --git a/teleforma/views/core.py b/teleforma/views/core.py
index 8802e831..61e7f2fe 100644
--- a/teleforma/views/core.py
+++ b/teleforma/views/core.py
@@ -241,7 +241,7 @@ def serve_media(media_path, content_type="", buffering=True, streaming=False):
     if not content_type:
         content_type = mimetypes.guess_type(media_path)[0]
 
-    if not settings.DEBUG:
+    if settings.DEBUG:
         return nginx_media_accel(media_path, content_type=content_type,
                                  buffering=buffering, streaming=streaming)
     else: