fix no room

diff --git a/teleforma/models.py b/teleforma/models.py
index a144bda399500a57cf10f6792771d68c625039a4..b25de58ccdcdecbd9b816e0b062fea08b7f7b028 100755 (executable)
--- 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 dcae2801888ae6fa1cfcd4a42f26bb293a7a304b..bbf646e1d03b79e1535fe02d71a6a17434902f64 100755 (executable)
--- 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()