From: Guillaume Pellerin <yomguy@parisson.com>
Date: Thu, 26 Dec 2013 15:26:34 +0000 (+0100)
Subject: media titles
X-Git-Tag: 2.8.1-pro~385
X-Git-Url: https://git.parisson.com/?a=commitdiff_plain;h=612b44dd1f12f20d0e3513947d0b7d5e4e9495c7;p=teleforma.git

media titles
---

diff --git a/teleforma/admin.py b/teleforma/admin.py
index ee826780..3159851f 100644
--- a/teleforma/admin.py
+++ b/teleforma/admin.py
@@ -76,9 +76,9 @@ class SeminarQuestionInline(admin.StackedInline):
 
 class SeminarAdmin(admin.ModelAdmin):
     inlines = [SeminarQuestionInline,]
-    filter_horizontal = ['professor', 'medias']
-    filter_vertical = ['docs_description',
-                         'docs_1', 'docs_2', 'docs_correct']
+    filter_horizontal = ['professor',]
+    filter_vertical = ['docs_description', 'docs_1', 
+                        'docs_2', 'docs_correct', 'medias']
     ordering = ['course', 'rank']
     search_fields = ['course__title', 'title', 'sub_title']
     list_filter = ('period', 'publish_date', 'expiry_date')
diff --git a/teleforma/models/core.py b/teleforma/models/core.py
index 5d60db67..9af6efee 100755
--- a/teleforma/models/core.py
+++ b/teleforma/models/core.py
@@ -456,9 +456,9 @@ class Media(MediaBase):
             strings.append(self.period.name)
         if self.course:
             strings.append(self.course.code)
-        elif self.course_type:
+        if self.course_type:
             strings.append(self.course_type.name)
-        elif self.item.title:
+        if self.item.title:
             strings.append(self.item.title)
         else:
             strings.append(os.path.basename(self.item.file.path))