From 1033afde84a2bf1e136ea5960e100e5358614fd1 Mon Sep 17 00:00:00 2001 From: yomguy Date: Wed, 25 Jul 2012 02:06:46 +0200 Subject: [PATCH] fix no room --- teleforma/models.py | 3 ++- teleforma/views.py | 8 ++++++-- 2 files changed, 8 insertions(+), 3 deletions(-) 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() -- 2.39.5