From: yomguy <yomguy@parisson.com>
Date: Wed, 25 Jul 2012 00:06:46 +0000 (+0200)
Subject: fix no room
X-Git-Tag: 0.8^2~4
X-Git-Url: https://git.parisson.com/?a=commitdiff_plain;h=1033afde84a2bf1e136ea5960e100e5358614fd1;p=teleforma.git

fix no room
---

diff --git a/teleforma/models.py b/teleforma/models.py
index a144bda3..b25de58c 100755
--- a/teleforma/models.py
+++ b/teleforma/models.py
@@ -253,10 +253,11 @@ class Conference(Model):
         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,
-                'organization': self.course.department.organization.name, 'streams':[] }
+                'streams':[] }
 
         if self.room:
             data['room'] = self.room.name
+            date['organization'] = self.room.organization.name
 
         streams = self.livestream.all()
         if streams:
diff --git a/teleforma/views.py b/teleforma/views.py
index dcae2801..bbf646e1 100755
--- a/teleforma/views.py
+++ b/teleforma/views.py
@@ -453,9 +453,13 @@ class ConferenceRecordView(FormView):
                 conf.session = conference['session']
                 user = User.objects.get(username=conference['professor_id'])
                 conf.professor = Professor.objects.get(user=user)
-                organization = Organization.objects.get(name=conference['organization'])
-                conf.room = Room.objects.get_or_create(name=conference['room'],
+                try:
+                    organization = Organization.objects.get_or_create(name=conference['organization'])
+                    conf.room = Room.objects.get_or_create(name=conference['room'],
                                                        organization=organization)
+                except:
+                    pass
+
                 conf.date_begin = datetime.datetime.now()
                 conf.save()
                 course.save()