1
0
mirror of https://github.com/haiwen/seahub.git synced 2025-09-13 13:50:07 +00:00

fix bug when search by nickname

This commit is contained in:
lian
2015-06-16 18:20:51 +08:00
parent 43d020a0a4
commit 56ce32ab1e

View File

@@ -476,23 +476,21 @@ class SearchUser(APIView):
searched_users = get_searched_users(q)
searched_profiles = Profile.objects.filter(nickname__contains=q).values('user')
# remove inactive users
searched_users = filter(lambda u: u.is_active, searched_users)
for p in searched_profiles:
# remove inactive users and add to result
for u in searched_users[:10]:
if u.is_active:
search_result.append(u.email)
for p in searched_profiles[:10]:
try:
user = User.objects.get(email = p['user'])
except User.DoesNotExist:
searched_profiles.remove(p)
continue
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'])
# remove duplicate emails