From bf3bcc768a36e5d2f32b6a888c5a5af0662e740c Mon Sep 17 00:00:00 2001
From: lian <imwhatiam123@gmail.com>
Date: Sat, 24 Oct 2015 11:41:38 +0800
Subject: [PATCH] [pubuser] only list ldap imported users

---
 seahub/views/__init__.py | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/seahub/views/__init__.py b/seahub/views/__init__.py
index e74c9cebc4..30e5ed5633 100644
--- a/seahub/views/__init__.py
+++ b/seahub/views/__init__.py
@@ -1684,7 +1684,7 @@ def pubuser(request):
     per_page = 20           # show 20 users per-page
 
     # Show LDAP users or Database users.
-    have_ldap_user = True if len(seaserv.get_emailusers('LDAP', 0, 1)) > 0 else False
+    have_ldap_user = True if len(seaserv.get_emailusers('LDAPImport', 0, 1)) > 0 else False
 
     try:
         ldap = True if int(request.GET.get('ldap', 0)) == 1 else False
@@ -1692,7 +1692,8 @@ def pubuser(request):
         ldap = False
 
     if ldap and have_ldap_user:
-        users_plus_one = seaserv.get_emailusers('LDAP',
+        # return all ldap imported users(active & inactive)
+        users_plus_one = seaserv.get_emailusers('LDAPImport',
                                                 per_page * (current_page - 1),
                                                 per_page + 1)
     else:
@@ -1703,6 +1704,7 @@ def pubuser(request):
     has_next = True if len(users_plus_one) == per_page + 1 else False
 
     if ldap and have_ldap_user:
+        # return the number of ldap imported users(only active)
         emailusers_count = seaserv.ccnet_threaded_rpc.count_emailusers('LDAP')
     else:
         emailusers_count = count_pub_users(request)
@@ -1712,6 +1714,7 @@ def pubuser(request):
     show_paginator = True if len(page_range) > 1 else False
 
     users = users_plus_one[:per_page]
+    # only show acitve users at pub user page
     users = filter(lambda u: u.is_active, users)
 
     return render_to_response('pubuser.html', {