From: Guillaume Pellerin <yomguy@parisson.com>
Date: Fri, 22 Jan 2016 17:25:16 +0000 (+0100)
Subject: Merge branch 'crfpa' of /var/git/teleforma into dev
X-Git-Tag: 1.1~183
X-Git-Url: https://git.parisson.com/?a=commitdiff_plain;h=b1dfe73616f5d4bf348ca90c56ac2f83fd4584da;p=teleforma.git

Merge branch 'crfpa' of /var/git/teleforma into dev

Conflicts:
	teleforma/admin.py
---

b1dfe73616f5d4bf348ca90c56ac2f83fd4584da
diff --cc teleforma/admin.py
index fbf3caf9,9775656c..459bf515
--- a/teleforma/admin.py
+++ b/teleforma/admin.py
@@@ -130,8 -53,11 +130,8 @@@ class CourseAdmin(admin.ModelAdmin)
  class DocumentAdmin(admin.ModelAdmin):
      exclude = ['readers']
      filter_horizontal = ['course_type']
-     search_fields = ['course__code', 'course__title']
 +    list_filter = ('course', 'period', 'date_added')
+     search_fields = ['course__code', 'course__title', 'type__name']
 -    list_filter = ('period', 'date_added')
  
  class MediaAdmin(admin.ModelAdmin):
      exclude = ['readers']