From: yomguy <yomguy@parisson.com>
Date: Wed, 25 Jul 2012 00:00:49 +0000 (+0200)
Subject: fix organization
X-Git-Tag: 0.8^2~5
X-Git-Url: https://git.parisson.com/?a=commitdiff_plain;h=6df3abae60d205802e458e2770fe5a8759dd7d71;p=teleforma.git

fix organization
---

diff --git a/teleforma/models.py b/teleforma/models.py
index cb176192..a144bda3 100755
--- a/teleforma/models.py
+++ b/teleforma/models.py
@@ -252,7 +252,12 @@ class Conference(Model):
     def to_json_dict(self):
         data = {'id': self.public_id, 'course_code': self.course.code,
                 'course_type': self.course_type.name, 'professor_id': self.professor.user.username,
-                'session': self.session, 'room': self.room.name, 'streams':[] }
+                'session': self.session,
+                'organization': self.course.department.organization.name, 'streams':[] }
+
+        if self.room:
+            data['room'] = self.room.name
+
         streams = self.livestream.all()
         if streams:
             for stream in streams:
diff --git a/teleforma/views.py b/teleforma/views.py
index b26f7022..dcae2801 100755
--- a/teleforma/views.py
+++ b/teleforma/views.py
@@ -450,10 +450,12 @@ class ConferenceRecordView(FormView):
             conf, c = Conference.objects.get_or_create(public_id=conference['id'],
                                                        course=course, course_type=course_type)
             if c:
-                user = User.objects.get(username=conference['professor_id'])
                 conf.session = conference['session']
+                user = User.objects.get(username=conference['professor_id'])
                 conf.professor = Professor.objects.get(user=user)
-                conf.room = Room.objects.get(name=conference['room'])
+                organization = Organization.objects.get(name=conference['organization'])
+                conf.room = Room.objects.get_or_create(name=conference['room'],
+                                                       organization=organization)
                 conf.date_begin = datetime.datetime.now()
                 conf.save()
                 course.save()