update record view, fix no station

diff --git a/teleforma/models/core.py b/teleforma/models/core.py
index 84797c17e059c0aaa828a20a44ea12fe22ecf19e..18a7ecc20e3bc719df1e3985e232818c30f5260b 100644 (file)
--- a/teleforma/models/core.py
+++ b/teleforma/models/core.py
@@ -384,9 +384,12 @@ class LiveStream(Model):
 
     @property
     def slug(self):
-        slug = '-'.join([self.conference.course.department.slug,
-                         self.conference.course.slug,
+        if self.conference:
+            slug = '-'.join([self.conference.course.slug,
                          self.conference.course_type.name.lower()])
+        else:
+            slug = self.element_type
+
         return slug
 
     @property

diff --git a/teleforma/templates/teleforma/course_conference_record.html b/teleforma/templates/teleforma/course_conference_record.html
index 1fd0b15d57200d12e8e5262eb209062ef66ca96e..c8fa3de6dd7e06982e4e4b78b20ee3c15f35a5e8 100644 (file)
--- a/teleforma/templates/teleforma/course_conference_record.html
+++ b/teleforma/templates/teleforma/course_conference_record.html
@@ -16,38 +16,14 @@ jQuery(window).ready(function(){
 
 
 {% block modules %}
-<div class="module">
-
-<h3><img src="{{ STATIC_URL }}telemeta/images/module_playlist.png" alt="playlists" style="vertical-align:middle" />{% trans "Form" %}</h3>
-<div style="background: white;">
-    <div class="conference_form">
-        <ul>
-        <form enctype="multipart/form-data" id="_StationForm" method="post" action="" name="formulaire">{% csrf_token %}
-            {% for error in form.non_field_errors %}<li class="error">{{ error }}</li>{% endfor %}
-            {% for field in form %}
-                {% if field.errors %}<li class="warning">{{ field.errors }}</li>{% endif %}
-                {% if not field.html_name in hidden_fields %}
-                 <li>{% trans field.label_tag %}</br />{{ field }}</li>
-                {% else %}
-                 {{ field.label_tag.as_hidden }} {{ field.as_hidden }}
-                {% endif %}
-            {% endfor %}
-        </form>
-    </ul>
-    </div>
-</div>
-
-</div>
-
-{% block module-action %}
 {% get_telecaster as telecaster %}
 {%  if telecaster %}
-<div class="module_action">
-<a href="#" class="component_icon button" id="action_red">{% trans "Record and stream" %}</a>
-</div>
+ <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>
+ <script type="text/javascript">server_status_callback();</script>
 {% endif %}
-{% endblock module-action %}
-
 </div>
 {% endblock modules %}
 
@@ -96,3 +72,6 @@ jQuery(window).ready(function(){
 
 
 
+{% block status %}
+{% endblock status %}
+

diff --git a/teleforma/templates/teleforma/courses.html b/teleforma/templates/teleforma/courses.html
index abca6dfd3304fc065963dfd10171ab61e1f7264a..5929204d5f77baee5325de20f66477e8fe81c4b7 100644 (file)
--- a/teleforma/templates/teleforma/courses.html
+++ b/teleforma/templates/teleforma/courses.html
@@ -60,8 +60,8 @@ $(document).ready(function(){
 </div>-->
 {% endblock notes %}
 
-</div>
 {% endblock modules %}
+</div>
 
 
 {% block course %}
@@ -104,13 +104,10 @@ $(document).ready(function(){
 {% 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>
+  <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>
-
-<script type="text/javascript">
-server_status_callback();
-</script>
+<script type="text/javascript">server_status_callback();</script>
 {% endif %}
 {% endblock status %}
 

diff --git a/teleforma/views/core.py b/teleforma/views/core.py
index 5b4401c14f6ba87d4a2f884c39563448e01c2ac7..d806b086d1a51920a45f94e8c61b93c5bb2272fa 100644 (file)
--- a/teleforma/views/core.py
+++ b/teleforma/views/core.py
@@ -471,7 +471,7 @@ class ConferenceListView(View):
                 s.teleforma.create_conference(conference.to_json_dict())
 
 
-class ConferenceRecordView(PeriodAccessMixin, FormView):
+class ConferenceRecordView(FormView):
     "Conference record form : TeleCaster module required"
 
     model = Conference
@@ -512,15 +512,19 @@ class ConferenceRecordView(PeriodAccessMixin, FormView):
             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()
+            try:
+                station.start()
+            except:
+                continue
             station.save()
             stream = LiveStream(conference=self.conference, server=server,
                             stream_type=type, streaming=True)
             stream.save()
             if server_type == 'stream-m':
-                #FIXME:
-#                self.snapshot(stream.snapshot_url, station.output_dir)
-                self.snapshot('http://localhost:8080/snapshot/safe', station.output_dir)
+                try:
+                    self.snapshot('http://localhost:8080/snapshot/safe', station.output_dir)
+                except:
+                    pass
 
         try:
             self.push(self.conference)