diff --git a/aleksis/core/tables.py b/aleksis/core/tables.py index d60b691c2abc995e00d2b66c39e9ca35f641fe87..4efd49ff2684d2792f1bca9bd3f1a1d73594124b 100644 --- a/aleksis/core/tables.py +++ b/aleksis/core/tables.py @@ -44,6 +44,7 @@ class FullPersonsTable(PersonsTable): """Table to list persons.""" photo = tables.Column(verbose_name=_("Photo"), accessor="pk", orderable=False) + address = tables.Column(verbose_name=_("Address"), accessor="pk", orderable=False) class Meta(PersonsTable.Meta): fields = ( @@ -51,10 +52,6 @@ class FullPersonsTable(PersonsTable): "date_of_birth", "sex", "email", - "street", - "housenumber", - "postal_code", - "place", ) sequence = ("photo", "first_name", "last_name", "...") @@ -69,6 +66,15 @@ class FullPersonsTable(PersonsTable): self.request, ) + def render_address(self, value, record): + return render_to_string( + "core/partials/address.html", + { + "person": record, + }, + self.request, + ) + def before_render(self, request): """Hide columns if user has no permission to view them.""" if not self.request.user.has_perm("core.view_person_rule"): diff --git a/aleksis/core/templates/core/partials/address.html b/aleksis/core/templates/core/partials/address.html new file mode 100644 index 0000000000000000000000000000000000000000..74a01bde2494d94256432923f5f27c279da2e564 --- /dev/null +++ b/aleksis/core/templates/core/partials/address.html @@ -0,0 +1,2 @@ +{{ person.street }} {{ person.housenumber }}<br> +{{ person.postal_code }} {{ person.place }} diff --git a/aleksis/core/views.py b/aleksis/core/views.py index 2a501d52bbe0e3a4e61a0d0e7d0d5c1438be6a25..185cf225841c7b7cf2e4c3a99f5cea34e332550c 100644 --- a/aleksis/core/views.py +++ b/aleksis/core/views.py @@ -367,7 +367,7 @@ def group(request: HttpRequest, id_: int) -> HttpResponse: owners = group.owners.all() # Build table - owners_table = PersonsTable(owners) + owners_table = FullPersonsTable(owners) RequestConfig(request).configure(owners_table) context["owners_table"] = owners_table