fix stream types

diff --git a/teleforma/models.py b/teleforma/models.py
index a55be25213c5331237f02b3cbd067e3a9c03ed86..cb1761923f836f679c112ce77b1e23635e9953c3 100755 (executable)
--- a/teleforma/models.py
+++ b/teleforma/models.py
@@ -258,7 +258,8 @@ class Conference(Model):
             for stream in streams:
                 data['streams'].append({'host': stream.server.host,
                                         'port': stream.server.port,
-                                        'type': stream.server.type })
+                                        'server_type': stream.server.type,
+                                        'stream_type': stream.stream_type  })
         return data
 
     class Meta:

diff --git a/teleforma/views.py b/teleforma/views.py
index 2e6b4c1d18439b487c6bf58a7c6bfbde6f5e9bba..880c4adbdee30cf54ff2081aaeed1293cfadcf3d 100755 (executable)
--- a/teleforma/views.py
+++ b/teleforma/views.py
@@ -458,13 +458,14 @@ class ConferenceRecordView(FormView):
                 for stream in conference['streams']:
                     host = stream['host']
                     port = stream['port']
-                    server_type = stream['type']
+                    server_type = stream['server_type']
+                    stream_type = stream['stream_type']
                     site = Site.objects.all()
                     server, c = StreamingServer.objects.get_or_create(host=site[0],
                                                                       port=port,
                                                                       type=server_type)
                     stream = LiveStream(conference=conf, server=server,
-                                        stream_type=type, streaming=True)
+                                        stream_type=stream_type, streaming=True)
                     stream.save()
         else:
             raise 'Error : Bad Conference dictionnary'