ynerant
/
nk20
mirror of https://gitlab.crans.org/bde/nk20
1
0
Fork 0
Code Issues Releases Wiki Activity

🐛 Display full registration table when the search bar is empty

This commit is contained in:
Yohann D'ANELLO 2020-08-03 11:32:37 +02:00
parent 94086505e6
commit f8a4087e56
2 changed files with 6 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
apps/registration/views.py
View File

@ -179,8 +179,6 @@ class FutureUserListView(ProtectQuerysetMixin, LoginRequiredMixin, SingleTableVi
| Q(profile__section__iregex=pattern) | Q(profile__section__iregex=pattern)
| Q(username__iregex="^" + pattern) | Q(username__iregex="^" + pattern)
) )
else:
qs = qs.none()
return qs[:20] return qs[:20]

14
apps/wei/views.py
View File

@ -236,14 +236,12 @@ class WEIRegistrationsView(ProtectQuerysetMixin, LoginRequiredMixin, SingleTable
pattern = self.request.GET.get("search", "") pattern = self.request.GET.get("search", "")
if not pattern: if not pattern:
return qs.none() qs = qs.filter(
Q(user__first_name__iregex=pattern)
qs = qs.filter( | Q(user__last_name__iregex=pattern)
Q(user__first_name__iregex=pattern) | Q(user__note__alias__name__iregex="^" + pattern)
| Q(user__last_name__iregex=pattern) | Q(user__note__alias__normalized_name__iregex="^" + Alias.normalize(pattern))
| Q(user__note__alias__name__iregex="^" + pattern) )
| Q(user__note__alias__normalized_name__iregex="^" + Alias.normalize(pattern))
)
return qs[:20] return qs[:20]