From: yomguy <yomguy@parisson.com>
Date: Sun, 4 Nov 2012 16:57:14 +0000 (+0100)
Subject: rm TELECASTER_MASTER_SERVER, get conference.department.domain instead
X-Git-Tag: 0.9-probarreau~333
X-Git-Url: https://git.parisson.com/?a=commitdiff_plain;h=d641cf471316dd03d311234c6e200262b44137a8;p=teleforma.git

rm TELECASTER_MASTER_SERVER, get conference.department.domain instead
---

diff --git a/teleforma/models/core.py b/teleforma/models/core.py
index f3b2f598..6bdd3122 100644
--- 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 7194c95f..f2cbfdd7 100644
--- 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())