fix media title, add id search field to conf admin

diff --git a/teleforma/admin.py b/teleforma/admin.py
index aa617d8e7019aab5baac4bfd1bc5c13139dab906..06b8e417e38f15b1eb8804269c1c32f9179136b5 100644 (file)
--- a/teleforma/admin.py
+++ b/teleforma/admin.py
@@ -47,6 +47,8 @@ class MediaAdmin(admin.ModelAdmin):
 
 class ConferenceAdmin(admin.ModelAdmin):
     exclude = ['readers']
+    search_fields = ['public_id']
+
 
 admin.site.unregister(User)
 admin.site.register(Organization)

diff --git a/teleforma/models.py b/teleforma/models.py
index 6170a65832afdf44c134b068b6ea7accf705779e..a04145a7224b5b6be401e0b2da2762ef75c27f31 100755 (executable)
--- a/teleforma/models.py
+++ b/teleforma/models.py
@@ -454,12 +454,12 @@ class Media(MediaBase):
             self.save()
 
     def __unicode__(self):
-        if self.course:
-            return self.course.title
-        elif self.conference:
+        if self.conference:
             return self.conference.description
+        elif self.course:
+            return self.course.title + ' ' + self.course_type.name
         else:
-            return self.title
+            return self.item.file
 
     def save(self, **kwargs):
         if self.course: