From 62d01d6d99d2119b2603b031cea8ae8307444d2e Mon Sep 17 00:00:00 2001
From: yomguy <yomguy@parisson.com>
Date: Sat, 14 Jul 2012 00:46:18 +0200
Subject: [PATCH] fix video url

---
 .../templates/teleforma/course_conference.html      | 13 ++++++++-----
 teleforma/views.py                                  |  3 ++-
 2 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/teleforma/templates/teleforma/course_conference.html b/teleforma/templates/teleforma/course_conference.html
index 50ea0cbe..02f5a3ea 100644
--- a/teleforma/templates/teleforma/course_conference.html
+++ b/teleforma/templates/teleforma/course_conference.html
@@ -4,11 +4,10 @@
 {% load i18n %}
 
 {% block module-action %}
-{% if "telecaster"|installed %}
 <script src="{{ STATIC_URL }}teleforma/js/application.js" type="text/javascript"></script>
-{% if 'telecaster'|installed %}
+{% get_telecaster as telecaster %}
+{%  if telecaster %}
 <script src="{{ STATIC_URL }}telecaster/js/application.js" type="text/javascript"></script>
-{% endif %}
 <script type="text/javascript">
 
 var conferenceUtils = {
@@ -79,13 +78,15 @@ jQuery(window).ready(function(){
 {% block chat %}
 <div id="module-set" style="width: 22%">
 
-{% if 'telecaster'|installed %}
+{% get_telecaster as telecaster %}
+{%  if telecaster %}
 <div class="module">
  <h3><img src="{{STATIC_URL}}teleforma/images/status.png" alt="status" style="vertical-align:middle" /> {% trans "Status" %}</h3>
  <div id="server_status_table_wrapper" class="status"></div>
 </div>
 {% endif %}
 
+
 {% if room %}
 {% with "Local tweeter" as title %}
 {% include "teleforma/inc/chat_room.html" %}
@@ -94,7 +95,9 @@ jQuery(window).ready(function(){
 
 </div>
 
-{% if 'telecaster'|installed %}
+<script src="{{ STATIC_URL }}teleforma/js/application.js" type="text/javascript"></script>
+{% get_telecaster as telecaster %}
+{%  if telecaster %}
 <script type="text/javascript">
 server_status_callback();
 </script>
diff --git a/teleforma/views.py b/teleforma/views.py
index 8686c486..804e3fea 100755
--- a/teleforma/views.py
+++ b/teleforma/views.py
@@ -387,7 +387,8 @@ class ConferenceRecordView(FormView):
             type = station['type']
             conf = station['conf']
             port = station['port']
-            server, c= StreamingServer.objects.get_or_create(host=status.ip, port=port)
+            server_type = station['server_type']
+            server, c = StreamingServer.objects.get_or_create(host=status.ip, port=port, type=server_type)
             station = Station(conference=self.conference, public_id=uuid)
             station.setup(conf)
             station.start()
-- 
2.39.5