rm TELECASTER_MASTER_SERVER, get conference.department.domain instead

diff --git a/teleforma/models/core.py b/teleforma/models/core.py
index f3b2f59806b3d50f019289a5a341c2398243ae12..6bdd31223616c0ed74eba2928de6c42a111b3f07 100644 (file)
--- a/teleforma/models/core.py
+++ b/teleforma/models/core.py
@@ -269,7 +269,7 @@ class Conference(Model):
                 'course_type': self.course_type.name, 'professor_id': self.professor.user.username,
                 'period': self.period, 'department': self.department,
                 'session': self.session,
-                'streams':[] }
+                'streams': [] }
 
         if self.room:
             data['room'] = self.room.name

diff --git a/teleforma/views/core.py b/teleforma/views/core.py
index 7194c95f143cf594151cc7c3ac2c7df1f09f7cd8..f2cbfdd7349fe7a96cdda7aeb3e889b0c5653440 100644 (file)
--- a/teleforma/views/core.py
+++ b/teleforma/views/core.py
@@ -391,7 +391,7 @@ class ConferenceView(DetailView):
             station.stop()
         if 'telecaster' in settings.INSTALLED_APPS:
             try:
-                url = 'http://' + settings.TELECASTER_MASTER_SERVER + '/json/'
+                url = 'http://' + conference.department.domain + '/json/'
                 s = ServiceProxy(url)
                 s.teleforma.stop_conference(conference.public_id)
             except:
@@ -512,7 +512,7 @@ class ConferenceRecordView(FormView):
             raise 'Error : Bad Conference dictionnary'
 
     def push(self, conference):
-        url = 'http://' + settings.TELECASTER_MASTER_SERVER + '/json/'
+        url = 'http://' + conference.department.domain + '/json/'
         s = ServiceProxy(url)
         s.teleforma.create_conference(conference.to_json_dict())