fix localhost for monitoring conference

diff --git a/teleforma/templates/teleforma/course_conference.html b/teleforma/templates/teleforma/course_conference.html
index 505ccf086c0b4d5511576d83c4aeb758fe6d18da..7d7c6ec3d45bfbaf4575a7165db0487688cb623b 100644 (file)
--- a/teleforma/templates/teleforma/course_conference.html
+++ b/teleforma/templates/teleforma/course_conference.html
@@ -37,7 +37,7 @@
 <div class="video">
 <video width="640" height="360" controls autoplay preload="auto">
 <!-- Hello Chrome and Firefox (and Opera?) -->
-<source src="{{ livestream.url }}" type="video/webm" />
+<source src="{{ livestream.url|get_host:host }}" type="video/webm" />
 </video>
 </div>
 
@@ -45,7 +45,7 @@
 <div class="audio">
 <audio controls autoplay preload="auto">
 <!-- Hello Chrome and Firefox (and Opera?) -->
-<source src="{{ livestream.url }}" type="audio/mpeg" />
+<source src="{{ livestream.url|get_host:host }}" type="audio/mpeg" />
 </audio>
 </div>
 {% endif %}

diff --git a/teleforma/templatetags/teleforma_tags.py b/teleforma/templatetags/teleforma_tags.py
index 68869a76a856e1cb5899b9cbbacc620f042df8a2..2d60abadbe748475dcf80bda9f55f9ff701e3725 100644 (file)
--- a/teleforma/templatetags/teleforma_tags.py
+++ b/teleforma/templatetags/teleforma_tags.py
@@ -53,6 +53,7 @@ import django.utils.timezone as timezone
 from timezones.utils import localtime_for_timezone
 from django.utils.translation import ugettext_lazy as _
 from teleforma.views import get_courses
+from urlparse import urlparse
 
 register = template.Library()
 
@@ -186,3 +187,12 @@ def get_video_id(media):
         if m.type == "webm":
             break
     return m.id
+
+@register.filter
+def get_host(url, host):
+    u = urlparse(url)
+    if host == '127.0.0.1' or host == 'localhost':
+        u['netloc'] = host
+        return u.geturl()
+    else:
+        return url

diff --git a/teleforma/views.py b/teleforma/views.py
index 478c702bac79822ead66512c6e22b2a1be85bd6f..24c086b8401d295c237185d121ea57af9cf29d26 100755 (executable)
--- a/teleforma/views.py
+++ b/teleforma/views.py
@@ -337,6 +337,7 @@ class ConferenceView(DetailView):
         context['room'] = get_room(name=conference.course.title, content_type=content_type,
                                    id=conference.id)
         context['livestreams'] = conference.livestream.all()
+        context['host'] = get_host(self.request)
         return context
 
     @jsonrpc_method('teleforma.conference_stop')