Merge pull request #1405 from kaedroho/user-without-username-search

Fix search on user without username
This commit is contained in:
Matt Westcott 2015-06-15 09:47:50 +01:00
commit 0d5cd61b01

View file

@ -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"))