media titles

diff --git a/teleforma/admin.py b/teleforma/admin.py
index ee826780aa482e7ad5457b46c7ee36fa024bd355..3159851f76760d669d6a6ca6b8ebf37aca8e60cd 100644 (file)
--- 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 5d60db67be064e56e34019579aa9f82619d3612b..9af6efeee4b8bb3982e703eebda99b237c22c916 100755 (executable)
--- 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))