ynerant/nk20
1
0
Fork 0
mirror of https://gitlab.crans.org/bde/nk20 synced 2025-06-21 01:48:21 +02:00
Code Issues Releases Wiki Activity

Merge branch 'beta-soon' into 'master'

Browse Source 
Beta soon

See merge request bde/nk20!85
This commit is contained in:
ynerant
2020-07-21 22:47:50 +02:00
parent a90eb2a6eb 5d70a809c2
commit 1735ba25a8
26 changed files with 353 additions and 68 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
apps/member/tables.py
View File

@ -25,7 +25,8 @@ class ClubTable(tables.Table):
order_by = ('id',)
model = Club
template_name = 'django_tables2/bootstrap4.html'
fields = ('id', 'name', 'email')
fields = ('name', 'email',)
order_by = ('name',)
row_attrs = {
'class': 'table-row',
'id': lambda record: "row-" + str(record.pk),

16
apps/member/views.py
View File

@ -299,6 +299,22 @@ class ClubListView(ProtectQuerysetMixin, LoginRequiredMixin, SingleTableView):
model = Club
table_class = ClubTable
def get_queryset(self, **kwargs):
"""
Filter the user list with the given pattern.
"""
qs = super().get_queryset().filter()
if "search" in self.request.GET:
pattern = self.request.GET["search"]
qs = qs.filter(
Q(name__iregex=pattern)
| Q(note__alias__name__iregex="^" + pattern)
| Q(note__alias__normalized_name__iregex=Alias.normalize("^" + pattern))
)
return qs
class ClubDetailView(ProtectQuerysetMixin, LoginRequiredMixin, DetailView):
"""