]> git.parisson.com Git - teleforma.git/commitdiff
fix station desc
authoryomguy <yomguy@parisson.com>
Thu, 19 Jul 2012 11:49:02 +0000 (13:49 +0200)
committeryomguy <yomguy@parisson.com>
Thu, 19 Jul 2012 11:49:02 +0000 (13:49 +0200)
teleforma/management/commands/teleforma-import-conferences.py
teleforma/models.py

index 6ff5e54956b42a95ceccfa57e29f63f5facf010f..48a75ab5e43665b932ed24c73a56cec042c2f10e 100644 (file)
@@ -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
index 32d7d0289c7cfce5947477fe30d495018c603eaf..8846e1567cbf96c5595b8d79157575b05634fd33 100755 (executable)
@@ -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):