From ef2dc5cefa2f9ba94edea7cfce8913e3f25723bd Mon Sep 17 00:00:00 2001
From: Kevin McCarthy <kmccarth@redhat.com>
Date: Tue, 28 Aug 2007 09:20:12 -0700
Subject: Changes for larger data demo. Add fields to search results Put
 result() call inside try block - it's throwing an exception Trap ADMINLIMIT
 and SIZELIMIT exceptions

---
 ipa-server/ipa-gui/ipagui/controllers.py         |  2 +-
 ipa-server/ipa-gui/ipagui/templates/userlist.kid | 28 ++++++++++++++++++++++--
 2 files changed, 27 insertions(+), 3 deletions(-)

(limited to 'ipa-server/ipa-gui')

diff --git a/ipa-server/ipa-gui/ipagui/controllers.py b/ipa-server/ipa-gui/ipagui/controllers.py
index 7dff9c908..ca2d15a2d 100644
--- a/ipa-server/ipa-gui/ipagui/controllers.py
+++ b/ipa-server/ipa-gui/ipagui/controllers.py
@@ -145,7 +145,7 @@ class Root(controllers.RootController):
             try:
                 users = client.find_users(uid.encode('utf-8'))
             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())
diff --git a/ipa-server/ipa-gui/ipagui/templates/userlist.kid b/ipa-server/ipa-gui/ipagui/templates/userlist.kid
index df3e247e4..1b4a1201a 100644
--- a/ipa-server/ipa-gui/ipagui/templates/userlist.kid
+++ b/ipa-server/ipa-gui/ipagui/templates/userlist.kid
@@ -15,7 +15,7 @@
     </div>
     <div py:if='users != None'>
         <h2>Results</h2>
-        <table py:if='len(users) > 0'>
+        <table py:if='len(users) > 0' border="1">
             <tr>
                 <th>
                     <label class="fieldlabel" py:content="fields.uid.label" />
@@ -23,13 +23,37 @@
                 <th>
                     Name
                 </th>
+                <th>
+                    Phone
+                </th>
+                <th>
+                    Unit
+                </th>
+                <th>
+                    Title
+                </th>
+                <th>
+                    License Plate
+                </th>
             </tr>
             <tr py:for="user in users">
                 <td>
                     <a href="${tg.url('/usershow',uid=user.uid)}">${user.uid}</a>
                 </td>
                 <td>
-                    ${user.cn}
+                    ${user.givenName} ${user.sn}
+                </td>
+                <td>
+                    ${user.telephoneNumber}
+                </td>
+                <td>
+                    ${user.ou}
+                </td>
+                <td>
+                    ${user.title}
+                </td>
+                <td>
+                    ${user.carLicense}
                 </td>
             </tr>
         </table>
-- 
cgit