date behaviour is correct

This commit is contained in:
Qwann 2018-08-22 14:04:42 +02:00
parent c723f53909
commit 7ebc34d5aa
2 changed files with 3 additions and 7 deletions

View file

@ -62,13 +62,9 @@ class ActivityAdmin(admin.ModelAdmin):
filter_horizontal = ['tags', 'places', ] filter_horizontal = ['tags', 'places', ]
fieldsets = ( fieldsets = (
('Général', { ('Général', {
'fields': ('event', 'parent', 'title', 'is_public', 'places', ), 'fields': ('event', 'parent', 'title', 'is_public', ('beginning', 'end', ), 'places', ),
'description': "Tous ces champs sont héritables (sauf parent et Évènement)", 'description': "Tous ces champs sont héritables (sauf parent et Évènement)",
}), }),
('Champs non-héritables', {
'fields': ('parent', ),
'description': "Tous ces champs doivent être spécifiés",
}),
('Permanences', { ('Permanences', {
'fields': ('has_perm', ('min_perm', 'max_perm', ), ), 'fields': ('has_perm', ('min_perm', 'max_perm', ), ),
'classes': ('collapse',), 'classes': ('collapse',),

View file

@ -166,9 +166,9 @@ AUTH_PASSWORD_VALIDATORS = [
# Internationalization # Internationalization
# https://docs.djangoproject.com/en/1.8/topics/i18n/ # https://docs.djangoproject.com/en/1.8/topics/i18n/
LANGUAGE_CODE = 'en-us' LANGUAGE_CODE = 'fr-fr'
TIME_ZONE = 'UTC' TIME_ZONE = 'Europe/Paris'
USE_I18N = True USE_I18N = True