From: Guillaume Pellerin <guillaume.pellerin@parisson.com>
Date: Wed, 17 Nov 2021 12:48:53 +0000 (+0100)
Subject: Merge branch 'master' of git.parisson.com:git/teleforma
X-Git-Tag: 2.5.0~21
X-Git-Url: https://git.parisson.com/?a=commitdiff_plain;h=40140b286115d59344267ef54d5e1a93c4957bb7;p=teleforma.git

Merge branch 'master' of git.parisson.com:git/teleforma
---

40140b286115d59344267ef54d5e1a93c4957bb7
diff --cc teleforma/admin.py
index 0942d260,aeae20b6..51f35a33
--- a/teleforma/admin.py
+++ b/teleforma/admin.py
@@@ -369,10 -391,11 +391,11 @@@ class ConferenceAdmin(admin.ModelAdmin)
      inlines = [MediaInline, ]
      exclude = ['readers']
      list_per_page = 30
 -    list_filter = ('course', 'period', 'date_begin', 'session')
 +    list_filter = ('course', 'period', 'date_begin', 'session', 'course_type')
      search_fields = ['public_id', 'id',
-                      'course__code', 'course__title', 'session',]
-     actions = [publish_conferences, ]
+                      'course__code', 'course__title', 'session']
+     actions = [publish_conferences, duplicate_conferences]
+     list_display = ['__str__', 'public_id', 'comment']
  
  
  class HomeAdmin(admin.ModelAdmin):