From: Yoan Le Clanche <yoan@ellington.pilotsystems.net>
Date: Thu, 27 Sep 2018 14:52:27 +0000 (+0200)
Subject: merge
X-Git-Tag: 1.4.0~36^2
X-Git-Url: https://git.parisson.com/?a=commitdiff_plain;h=6ee1b3ac32cc405d90808df155360ad60e15ade2;p=teleforma.git

merge
---

6ee1b3ac32cc405d90808df155360ad60e15ade2
diff --cc teleforma/admin.py
index a04f5bb2,ec6b4432..9288d2bc
--- a/teleforma/admin.py
+++ b/teleforma/admin.py
@@@ -181,8 -195,10 +195,9 @@@ class AppointmentDayInline(admin.Tabula
      readonly_fields = ('get_nb_slots', 'get_nb_jury', 'changeform_link', )
      model = AppointmentDay
  
+ 
  class AppointmentPeriodAdmin(admin.ModelAdmin):
 -    list_filter = ('period',)
 -    list_display = ('name', 'period', 'nb_appointments')
 +    list_display = ('name', 'periods_names', 'start', 'end', 'enable_appointment')
  
      inlines = [ AppointmentDayInline ]