Seperate DB and LDAP when search users

seahub/api2/views.py

@@ -431,15 +431,13 @@ class SearchUser(APIView):
 
     def get(self, request, format=None):
 
-        username = request.user.username
-        q = request.GET.get('q', '')
-        search_result = []
+        q = request.GET.get('q', None)
 
         if not q:
-            contacts = Contact.objects.get_contacts_by_user(username)
-            for c in contacts:
-                search_result.append(c.contact_email)
-        else:
+            return api_error(status.HTTP_400_BAD_REQUEST, 'Argument missing.')
+
+        username = request.user.username
+        search_result = []
         searched_users = []
         searched_profiles = []
 
@@ -454,12 +452,18 @@ class SearchUser(APIView):
                 searched_profiles = Profile.objects.filter(Q(user__in=[u.email for u in users]) & \
                                                            Q(nickname__contains=q)).values('user')
             elif ENABLE_GLOBAL_ADDRESSBOOK:
-                    searched_users = seaserv.ccnet_threaded_rpc.search_emailusers(q, 0, 10)
+                searched_users = get_searched_users(q)
                 searched_profiles = Profile.objects.filter(nickname__contains=q).values('user')
             else:
                 users = []
                 contacts = Contact.objects.get_contacts_by_user(username)
                 for c in contacts:
+                    try:
+                        user = User.objects.get(email = c.contact_email)
+                        c.is_active = user.is_active
+                    except User.DoesNotExist:
+                        continue
+
                     c.email = c.contact_email
                     users.append(c)
 
@@ -469,9 +473,22 @@ class SearchUser(APIView):
                 searched_profiles = Profile.objects.filter(Q(user__in=[u.email for u in users]) & \
                                                            Q(nickname__contains=q)).values('user')
         else:
-                searched_users = seaserv.ccnet_threaded_rpc.search_emailusers(q, 0, 10)
+            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:
+            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)
+
+        # add to result
         for u in searched_users[:10]:
             search_result.append(u.email)
 
@@ -492,18 +509,29 @@ class SearchUser(APIView):
 def format_user_result(users):
     results = []
     for email in users:
-        try:
-            user = User.objects.get(email = email)
-            if user.is_active:
         results.append({
             "email": email,
             "avatar": avatar(email, 32),
             "name": email2nickname(email),
         })
-        except User.DoesNotExist:
-            continue
     return results
 
+def get_searched_users(q):
+    searched_users = []
+    searched_db_users = []
+    searched_ldap_users  = []
+
+    searched_db_users = seaserv.ccnet_threaded_rpc.search_emailusers('DB', q, 0, 10)
+
+    count = len(searched_db_users)
+    if count < 10:
+        searched_ldap_users = seaserv.ccnet_threaded_rpc.search_emailusers('LDAP', q, 0, 10 - count)
+
+    searched_users.extend(searched_db_users)
+    searched_users.extend(searched_ldap_users)
+
+    return searched_users
+
 class Search(APIView):
     """ Search all the repos
     """

seahub/views/sysadmin.py

@@ -1279,7 +1279,10 @@ def user_search(request):
     """
     email = request.GET.get('email', '')
 
-    users = ccnet_threaded_rpc.search_emailusers(email, -1, -1)
+    users = ccnet_threaded_rpc.search_emailusers('DB', email, -1, -1)
+    ldap_users = ccnet_threaded_rpc.search_emailusers('LDAP', email, -1, -1)
+    users.extend(ldap_users)
+
     last_logins = UserLastLogin.objects.filter(username__in=[x.email for x in users])
     if ENABLE_TRIAL_ACCOUNT:
         trial_users = TrialAccount.objects.filter(user_or_org__in=[x.email for x in users])