From 982874cd6921ce78a5ad9c2bd343d1171b4daa8d Mon Sep 17 00:00:00 2001
From: yomguy <yomguy@parisson.com>
Date: Wed, 8 Aug 2012 10:41:01 +0200
Subject: [PATCH] fix media title, add id search field to conf admin

---
 teleforma/admin.py  | 2 ++
 teleforma/models.py | 8 ++++----
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/teleforma/admin.py b/teleforma/admin.py
index aa617d8e..06b8e417 100644
--- 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 6170a658..a04145a7 100755
--- 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:
-- 
2.39.5