mirror of
https://github.com/Hopiu/wagtail.git
synced 2026-05-03 21:14:46 +00:00
Merge pull request #1405 from kaedroho/user-without-username-search
Fix search on user without username
This commit is contained in:
commit
0d5cd61b01
1 changed files with 5 additions and 1 deletions
|
|
@ -33,7 +33,11 @@ def index(request):
|
|||
q = form.cleaned_data['q']
|
||||
|
||||
is_searching = True
|
||||
users = User.objects.filter(Q(username__icontains=q) | Q(first_name__icontains=q) | Q(last_name__icontains=q) | Q(email__icontains=q))
|
||||
|
||||
if User.USERNAME_FIELD == 'username':
|
||||
users = User.objects.filter(Q(username__icontains=q) | Q(first_name__icontains=q) | Q(last_name__icontains=q) | Q(email__icontains=q))
|
||||
else:
|
||||
users = User.objects.filter(Q(first_name__icontains=q) | Q(last_name__icontains=q) | Q(email__icontains=q))
|
||||
else:
|
||||
form = SearchForm(placeholder=_("Search users"))
|
||||
|
||||
|
|
|
|||
Loading…
Reference in a new issue