From: yomguy Date: Thu, 19 Jul 2012 11:49:02 +0000 (+0200) Subject: fix station desc X-Git-Tag: 0.7-dev^2~57^2 X-Git-Url: https://git.parisson.com/?a=commitdiff_plain;h=d06a0841b92b6e2b99ec6f94799663407034648b;p=teleforma.git fix station desc --- diff --git a/teleforma/management/commands/teleforma-import-conferences.py b/teleforma/management/commands/teleforma-import-conferences.py index 6ff5e549..48a75ab5 100644 --- a/teleforma/management/commands/teleforma-import-conferences.py +++ b/teleforma/management/commands/teleforma-import-conferences.py @@ -75,7 +75,6 @@ class Command(BaseCommand): exist = False medias = conference.media.all() for media in medias: - print media.item.file if media.item.file == path: exist = True break diff --git a/teleforma/models.py b/teleforma/models.py index 32d7d028..8846e156 100755 --- a/teleforma/models.py +++ b/teleforma/models.py @@ -212,11 +212,17 @@ class Conference(Model): @property def description(self): - return ' - '.join([self.course.department.name, self.course.title, + if self.professor: + list = [self.course.department.name, self.course.title, self.course_type.name, self.session, self.professor.user.first_name, self.professor.user.last_name, - str(self.date_begin)]) + str(self.date_begin)] + else: + list = [self.course.department.name, self.course.title, + self.course_type.name, self.session, + str(self.date_begin)] + return ' - '.join() @property def slug(self):