mirror of
https://github.com/haiwen/seahub.git
synced 2025-09-15 14:49:09 +00:00
fix bug when search by nickname
This commit is contained in:
@@ -476,23 +476,21 @@ class SearchUser(APIView):
|
|||||||
searched_users = get_searched_users(q)
|
searched_users = get_searched_users(q)
|
||||||
searched_profiles = Profile.objects.filter(nickname__contains=q).values('user')
|
searched_profiles = Profile.objects.filter(nickname__contains=q).values('user')
|
||||||
|
|
||||||
# remove inactive users
|
|
||||||
searched_users = filter(lambda u: u.is_active, searched_users)
|
# remove inactive users and add to result
|
||||||
for p in searched_profiles:
|
for u in searched_users[:10]:
|
||||||
|
if u.is_active:
|
||||||
|
search_result.append(u.email)
|
||||||
|
|
||||||
|
for p in searched_profiles[:10]:
|
||||||
try:
|
try:
|
||||||
user = User.objects.get(email = p['user'])
|
user = User.objects.get(email = p['user'])
|
||||||
except User.DoesNotExist:
|
except User.DoesNotExist:
|
||||||
searched_profiles.remove(p)
|
|
||||||
continue
|
continue
|
||||||
|
|
||||||
if not user.is_active:
|
if not user.is_active:
|
||||||
searched_profiles.remove(p)
|
continue
|
||||||
|
|
||||||
# add to result
|
|
||||||
for u in searched_users[:10]:
|
|
||||||
search_result.append(u.email)
|
|
||||||
|
|
||||||
for p in searched_profiles[:10]:
|
|
||||||
search_result.append(p['user'])
|
search_result.append(p['user'])
|
||||||
|
|
||||||
# remove duplicate emails
|
# remove duplicate emails
|
||||||
|
Reference in New Issue
Block a user