From b58642415e284ebf397f3577bfe70277e84f6993 Mon Sep 17 00:00:00 2001 From: Jan Szejko Date: Thu, 16 Nov 2017 15:20:52 +0100 Subject: [PATCH] filter and extra column in confirmation admin --- wtem/admin.py | 6 ++++-- wtem/models.py | 3 +++ 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/wtem/admin.py b/wtem/admin.py index 4621f5f..efaf253 100644 --- a/wtem/admin.py +++ b/wtem/admin.py @@ -240,8 +240,10 @@ def report_view(request): class ConfirmationAdmin(admin.ModelAdmin): - list_display = ('email', 'first_name', 'last_name', 'readable_contact', 'readable_age', 'confirmed') - readonly_fields = ('contact', 'readable_contact', 'readable_age', 'key', 'confirmed') + list_display = ('email', 'first_name', 'last_name', 'readable_contact', 'school_phone', 'readable_age', 'confirmed') + readonly_fields = ('contact', 'readable_contact', 'readable_age', 'school_phone', 'key', 'confirmed') + list_filter = ('confirmed',) + list_select_related = ('contact',) def resend_mail(self, request, queryset): for confirmation in queryset: diff --git a/wtem/models.py b/wtem/models.py index 390687f..5a7e221 100644 --- a/wtem/models.py +++ b/wtem/models.py @@ -278,6 +278,9 @@ class Confirmation(models.Model): def readable_contact(self): return '%s <%s>' % (self.contact.body.get('przewodniczacy'), self.contact.contact) + def school_phone(self): + return '%s, tel. %s' % (self.contact.body.get('school'), self.contact.body.get('school_phone')) + def age(self): return timezone.now() - self.contact.created_at -- 2.20.1