Megre in form upstream

1 files changed, 8 insertions, 2 deletions

diff --git a/ipa-server/ipa-gui/ipagui/controllers.py b/ipa-server/ipa-gui/ipagui/controllers.py
index 7dff9c90..d767f268 100644
--- a/ipa-server/ipa-gui/ipagui/controllers.py
+++ b/ipa-server/ipa-gui/ipagui/controllers.py
@@ -140,15 +140,21 @@ class Root(controllers.RootController):
     def userlist(self, **kw):
         """Retrieve a list of all users and display them in one huge list"""
         users = None
+        counter = 0
         uid = kw.get('uid')
         if uid != None and len(uid) > 0:
             try:
                 users = client.find_users(uid.encode('utf-8'))
+                counter = users[0]
+                users = users[1:]
+                if counter == -1:
+                    turbogears.flash("These results are truncated.<br />" +
+                                    "Please refine your search and try again.")
             except ipaerror.IPAError, e:
-                turbogears.flash("User show failed: " + str(e))
+                turbogears.flash("User list failed: " + str(e))
                 raise turbogears.redirect("/userlist")
 
-        return dict(users=users, fields=forms.user.UserFields())
+        return dict(users=users, uid=uid, fields=forms.user.UserFields())
 
 
     @expose("ipagui.templates.usershow")