From 68eedc8d21973da4de3379cb192b42e2c3374904 Mon Sep 17 00:00:00 2001
From: Guillaume Pellerin <yomguy@parisson.com>
Date: Fri, 13 Feb 2015 01:39:23 +0100
Subject: [PATCH] Add author script in admin list Remove type from mountpoint
 (new default deefuzzer behavior)

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

diff --git a/teleforma/exam/admin.py b/teleforma/exam/admin.py
index 64bbff83..a2b2373f 100644
--- a/teleforma/exam/admin.py
+++ b/teleforma/exam/admin.py
@@ -27,8 +27,10 @@ class ScriptAdmin(admin.ModelAdmin):
     search_fields = ['author__username', 'author__last_name', 'corrector__username',
                     'corrector__last_name', 'course__title']
     readonly_fields = ('date_added','uuid','box_uuid','sha1','mime_type')
-    # exclude = ['options']
-    # inlines = [ScriptPageInline]
+    list_display = ('title', 'author_name')
+
+    def author_name(self, instance):
+        return instance.author.username
 
 
 admin.site.register(Script, ScriptAdmin)
diff --git a/teleforma/models/core.py b/teleforma/models/core.py
index a99b7c72..e1d6edbb 100644
--- a/teleforma/models/core.py
+++ b/teleforma/models/core.py
@@ -210,7 +210,7 @@ class Professor(Model):
     department = ForeignKey('Department', related_name='professor',
                                  verbose_name=_('department'),
                                  blank=True, null=True, on_delete=models.SET_NULL)
-    
+
     def __unicode__(self):
         if self.user.first_name and self.user.last_name:
             return self.user.last_name + ' ' + self.user.first_name[0] + '.'
@@ -428,7 +428,7 @@ class LiveStream(Model):
         if self.server.type == 'stream-m':
             return  'consume/' + self.slug
         else:
-            return self.slug + '.' + self.stream_type
+            return self.slug
 
     @property
     def snapshot_url(self):
-- 
2.39.5