From 476881f8c6144ea92ba42529e20921100245d59f Mon Sep 17 00:00:00 2001 From: Guillaume Pellerin Date: Thu, 16 Aug 2018 16:42:52 +0200 Subject: [PATCH] fix ulrs, temporary DEBUG --- teleforma/urls.py | 4 ++-- teleforma/views/core.py | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) 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.*)/medias/(?P.*)/detail/$', MediaView.as_view(), name="teleforma-media-detail"), url(r'^desk/periods/(?P.*)/medias/(?P.*)/embed/$', MediaViewEmbed.as_view(), name="teleforma-media-embed"), - url(r'^desk/periods/(?P.*)/medias/(?P.*)/download/$', MediaDownloadView.as_view(), name="teleforma-media-download"), - url(r'^desk/periods/(?P.*)/medias/(?P.*)/streaming/$', MediaStreamingView.as_view(), name="teleforma-media-streaming"), + url(r'^desk/periods/(?P.*)/medias/(?P.*)/download/$', MediaView.download(), name="teleforma-media-download"), + url(r'^desk/periods/(?P.*)/medias/(?P.*)/streaming/$', MediaView.streaming(), name="teleforma-media-streaming"), url(r'^desk/documents/(?P.*)/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: -- 2.39.5