From c137a5e691b2d2ee71734a3c62bf60a31b52c5b8 Mon Sep 17 00:00:00 2001 From: Schlabonski Date: Sun, 20 Nov 2016 17:58:36 +0100 Subject: [PATCH] add group to list display in member app --- jdav_web/members/admin.py | 3 ++- jdav_web/members/models.py | 7 +++++++ 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/jdav_web/members/admin.py b/jdav_web/members/admin.py index 7622147..0394801 100644 --- a/jdav_web/members/admin.py +++ b/jdav_web/members/admin.py @@ -22,7 +22,8 @@ from .models import (Member, Group, MemberList, MemberOnList, Klettertreff, class MemberAdmin(admin.ModelAdmin): fields = ['prename', 'lastname', 'email', 'street', 'town', 'phone_number', 'phone_number_parents', 'birth_date', 'group', 'gets_newsletter', 'comments'] - list_display = ('name', 'street', 'town', 'phone_number', 'phone_number_parents', 'birth_date', 'gets_newsletter', 'comments') + list_display = ('name', 'street', 'town', 'phone_number', + 'phone_number_parents', 'birth_date', 'gets_newsletter', 'get_group', 'comments') list_filter = ('group', 'gets_newsletter') diff --git a/jdav_web/members/models.py b/jdav_web/members/models.py index 956cab8..fde92ad 100644 --- a/jdav_web/members/models.py +++ b/jdav_web/members/models.py @@ -47,6 +47,13 @@ class Member(models.Model): def name(self): """Returning whole name (prename + lastname)""" return "{0} {1}".format(self.prename, self.lastname) + + def get_group(self): + """Returns a string of groups in which the member is.""" + groupstring = ''.join(g.name + ',\n' for g in self.group.all()) + groupstring = groupstring[:-2] + return groupstring + get_group.short_description = _('Group') class Meta: verbose_name = _('member')