Add client-side search limit parameter for user search.

Limit editgroup user ajax search.
Minor UI cleanup for editgroup.

4 files changed, 25 insertions, 10 deletions

diff --git a/ipa-server/ipa-gui/ipagui/controllers.py b/ipa-server/ipa-gui/ipagui/controllers.py
index fd661eebb..dcf65530c 100644
--- a/ipa-server/ipa-gui/ipagui/controllers.py
+++ b/ipa-server/ipa-gui/ipagui/controllers.py
@@ -214,16 +214,18 @@ class Root(controllers.RootController):
            This method is used for ajax calls."""
         client.set_principal(identity.current.user_name)
         users = []
+        searchlimit = 100
         uid = kw.get('uid')
         if uid != None and len(uid) > 0:
             try:
-                users = client.find_users(uid.encode('utf-8'))
+                users = client.find_users(uid.encode('utf-8'), None, searchlimit)
                 counter = users[0]
                 users = users[1:]
             except ipaerror.IPAError, e:
                 turbogears.flash("User list failed: " + str(e))
 
-        return dict(users=users, uid=uid, fields=forms.user.UserFields())
+        return dict(users=users, uid=uid, fields=forms.user.UserFields(),
+                counter=counter)
 
 
     @expose("ipagui.templates.usershow")
diff --git a/ipa-server/ipa-gui/ipagui/static/css/style.css b/ipa-server/ipa-gui/ipagui/static/css/style.css
index 6199affbc..b3ed830d1 100644
--- a/ipa-server/ipa-gui/ipagui/static/css/style.css
+++ b/ipa-server/ipa-gui/ipagui/static/css/style.css
@@ -148,6 +148,16 @@ body {
   text-align: right;
 }
 
+.floatlist {
+  float: right;
+  width: 50%;
+}
+
+.floatheader {
+  color: #885555;
+  font-weight: bold;
+}
+
 .small {
   font-size: small;
 }
diff --git a/ipa-server/ipa-gui/ipagui/templates/groupeditform.kid b/ipa-server/ipa-gui/ipagui/templates/groupeditform.kid
index 5c2fea744..9e388ee70 100644
--- a/ipa-server/ipa-gui/ipagui/templates/groupeditform.kid
+++ b/ipa-server/ipa-gui/ipagui/templates/groupeditform.kid
@@ -200,8 +200,8 @@
     <div>
       <div class="formsection">Group Members</div>
 
-      <div style="float:right; width:50%">
-        <div>To Remove:</div>
+      <div class="floatlist">
+        <div class="floatheader">To Remove:</div>
         <div id="delmembers">
         </div>
       </div>
@@ -229,8 +229,8 @@
     <div style="clear:both">
       <div class="formsection">Add Persons</div>
 
-      <div style="float:right; width:50%">
-        <div>To Add:</div>
+      <div class="floatlist">
+        <div class="floatheader">To Add:</div>
         <div id="newmembers">
         </div>
       </div>
diff --git a/ipa-server/ipa-gui/ipagui/templates/userlistajax.kid b/ipa-server/ipa-gui/ipagui/templates/userlistajax.kid
index a2d6a921d..e62fb8b91 100644
--- a/ipa-server/ipa-gui/ipagui/templates/userlistajax.kid
+++ b/ipa-server/ipa-gui/ipagui/templates/userlistajax.kid
@@ -23,11 +23,14 @@
     </div>
     <script type="text/javascript">
       if (results_counter == 0) {
-        $('search-results-count').appendChild(document.createTextNode(
-          "No results found for " + search_string));
+        var message = "No results found for " + search_string;
       } else {
-        $('search-results-count').appendChild(document.createTextNode(
-          "" + results_counter + " results found:"));
+        var message =  results_counter + " results found:";
       }
+      $('search-results-count').appendChild(document.createTextNode(message));
+    </script>
+    <script py:if="counter &lt; 0">
+      $('search-results-count').appendChild(document.createTextNode(
+        " (truncated)"));
     </script>
 </div>