From a5aa4e5b9c69973af29cc8920abe933a0731f5da Mon Sep 17 00:00:00 2001 From: Simon Caminada Date: Thu, 22 Mar 2018 22:34:50 +0100 Subject: [PATCH] bug fixes --- src/portal/admin.py | 3 +-- src/portal/models.py | 6 ++---- 2 files changed, 3 insertions(+), 6 deletions(-) diff --git a/src/portal/admin.py b/src/portal/admin.py index f772aaf..4c4015d 100644 --- a/src/portal/admin.py +++ b/src/portal/admin.py @@ -29,14 +29,13 @@ admin.site.register(User, UserAdmin) @admin.register(Information) class InformationAdmin(TranslatableAdmin): - list_display = ('title', 'published', 'publish_date') + list_display = ('title', 'published') list_filter = ('groups',) filter_horizontal = ('groups',) readonly_fields = ('informed_users',) fieldsets = ( (None, {'fields': ('title', 'published', 'image', 'cropping')}), (_('Permissions'), {'fields': ('groups',)}), - (_('Veröffentlichung'), {'fields': ('publish_date',)}), (_('Information'), {'fields': ('informed_users',)}), ) diff --git a/src/portal/models.py b/src/portal/models.py index 55c332f..a23315a 100644 --- a/src/portal/models.py +++ b/src/portal/models.py @@ -45,8 +45,6 @@ class Information(TranslatableModel): placeholder = PlaceholderField('content') published = models.BooleanField(verbose_name='Veröffentlicht', default=False) - publish_date = models.DateTimeField(verbose_name='Veröffentlichungsdatum', default=timezone.now) - informed_users = models.ManyToManyField(get_user_model(), verbose_name='Als gelesen markiert von:', null=True, blank=True) @@ -55,8 +53,8 @@ class Information(TranslatableModel): ) class Meta: - verbose_name = 'Mitglieder Aufgabe' - verbose_name_plural = 'Mitglieder Aufgaben' + verbose_name = 'Information' + verbose_name_plural = 'Informationen' ordering = ['-publish_date'] def __str__(self):