fix ulrs, temporary DEBUG

diff --git a/teleforma/urls.py b/teleforma/urls.py
index c9e7aa982b409e35b4b395f2e2ed0a04c153f6ff..2e723de97c99a450436fbdf740fd826e769a8b0a 100644 (file)
--- 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 8802e8315b18b9686f3e7c55f6e84de7140c7b93..61e7f2fe72a065f77523828fa805176ffde2299a 100644 (file)
--- 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: