rename streaming to stream

diff --git a/teleforma/templates/teleforma/course_media.html b/teleforma/templates/teleforma/course_media.html
index 336a32912f30e3fe2583c5b3a54359c43dec121c..9feada4e9b97cdba7c0baa5c0cb3f5531065753d 100644 (file)
--- a/teleforma/templates/teleforma/course_media.html
+++ b/teleforma/templates/teleforma/course_media.html
@@ -97,7 +97,7 @@ $(document).ready(function(){
 {% if "video" in media.mime_type %}
 <div class="video">
     <video id="my_video_1" class="video-js vjs-default-skin" width="864" height="480" controls preload="auto" data-setup='{}' {% if media.item.related.all %}{% for related in media.item.related.all %}{% if related.title == "preview" %}{% thumbnail related.file "640" as im %}poster="{{ im.url }}"{% endthumbnail %}{% endif %}{% endfor %}{% endif %}>
-        <source src="{% url teleforma-media-streaming period.id media.id %}" type="{{ media.mime_type }}" />
+        <source src="{% url teleforma-media-stream period.id media.id %}" type="{{ media.mime_type }}" />
     </video>
 </div>
 
@@ -121,7 +121,7 @@ $(document).ready(function(){
 </div>
 <div class="audio">
     <audio controls preload="auto">
-        <source src="{% url teleforma-media-streaming period.id media.id %}" type="{{ media.mime_type }}" />
+        <source src="{% url teleforma-media-stream period.id media.id %}" type="{{ media.mime_type }}" />
     </audio>
 </div>
 {% endif %}

diff --git a/teleforma/urls.py b/teleforma/urls.py
index 5d53db7271d7c8fd2cddd3bd1d81669ab1df4413..43a8ea57416b6db7d844a3f6af9c5d718e99adb1 100644 (file)
--- a/teleforma/urls.py
+++ b/teleforma/urls.py
@@ -81,7 +81,7 @@ 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/$', media.download, name="teleforma-media-download"),
-    url(r'^desk/periods/(?P<period_id>.*)/medias/(?P<pk>.*)/streaming/$', media.streaming, name="teleforma-media-streaming"),
+    url(r'^desk/periods/(?P<period_id>.*)/medias/(?P<pk>.*)/stream/$', media.stream, name="teleforma-media-stream"),
 
     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 6db396c982f51aac83d5ae384310c0815ff07126..933d54e78817486d8988b84318ae0f9fe460c7e1 100644 (file)
--- a/teleforma/views/core.py
+++ b/teleforma/views/core.py
@@ -468,7 +468,7 @@ class MediaView(CourseAccessMixin, DetailView):
         media.is_published = False
         media.save()
 
-    def streaming(self, request, period_id, pk, streaming=True):
+    def stream(self, request, period_id, pk, streaming=True):
         courses = get_courses(request.user)
         media = Media.objects.get(id=pk)
         if get_access(media, courses):