]> git.parisson.com Git - teleforma.git/commitdiff
merge
authorYoan Le Clanche <yoan@ellington.pilotsystems.net>
Thu, 27 Sep 2018 14:52:27 +0000 (16:52 +0200)
committerYoan Le Clanche <yoan@ellington.pilotsystems.net>
Thu, 27 Sep 2018 14:52:27 +0000 (16:52 +0200)
1  2 
teleforma/admin.py

index a04f5bb2889e7b22381a31ede65ab1119ff9082f,ec6b443207eca3f4da09fb879eae0992107fbbf7..9288d2bcd31f1adb5d06a0f3635ac62e9d24cc92
@@@ -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 ]