From 9ff2204f7889f6c11d2b0382b644f368efea2a00 Mon Sep 17 00:00:00 2001
From: cajus <cajus@594d385d-05f5-0310-b6e9-bd551577e9d8>
Date: Tue, 27 Oct 2009 10:04:58 +0000
Subject: [PATCH] Enabled uids

git-svn-id: https://oss.gonicus.de/repositories/gosa/trunk@14648 594d385d-05f5-0310-b6e9-bd551577e9d8
---
 gosa-core/plugins/admin/users/user-filter.xml |  8 +++-----
 gosa-core/plugins/admin/users/user-list.xml   | 10 +++++++++-
 2 files changed, 12 insertions(+), 6 deletions(-)

diff --git a/gosa-core/plugins/admin/users/user-filter.xml b/gosa-core/plugins/admin/users/user-filter.xml
index 71042d2fc..4bb82390e 100644
--- a/gosa-core/plugins/admin/users/user-filter.xml
+++ b/gosa-core/plugins/admin/users/user-filter.xml
@@ -10,14 +10,12 @@
   <search>
     <query>
       <backend>LDAP</backend>
-      <filter>(&amp;(objectClass=person)$NAME)</filter>
+      <filter>(&amp;(objectClass=gosaAccount)$NAME)</filter>
       <attribute>dn</attribute>
       <attribute>objectClass</attribute>
       <attribute>givenName</attribute>
       <attribute>sn</attribute>
-      <attribute>customerNumber</attribute>
-      <attribute>customerState</attribute>
-      <attribute>dateOfBirth</attribute>
+      <attribute>uid</attribute>
       <attribute>userPassword</attribute>
     </query>
     <scope>one</scope>
@@ -33,7 +31,7 @@
     <set>(|(cn=*$*)(sn=*$*)(givenName=*$*))</set>
     <autocomplete>
       <backend>LDAP</backend>
-      <filter>(&amp;(objectClass=person)(|(cn=*$NAME*)(sn=*$NAME*)(givenName=*$NAME*)))</filter>
+      <filter>(&amp;(objectClass=gosaAccount)(|(cn=*$NAME*)(sn=*$NAME*)(givenName=*$NAME*)))</filter>
       <attribute>cn</attribute>
       <frequency>0.5</frequency>
       <characters>3</characters>
diff --git a/gosa-core/plugins/admin/users/user-list.xml b/gosa-core/plugins/admin/users/user-list.xml
index ce6440e64..d6edc9558 100644
--- a/gosa-core/plugins/admin/users/user-list.xml
+++ b/gosa-core/plugins/admin/users/user-list.xml
@@ -30,7 +30,7 @@
   </definition>
 
   <table>
-    <layout>|20px||260px|200px;r|</layout>
+    <layout>|20px||200px|100px|200px;r|</layout>
 
     <department>
       <value>%{filter:objectType(dn,objectClass)}</value>
@@ -61,6 +61,14 @@
       <export>true</export>
     </column>
 
+    <column>
+      <label>ID</label>
+      <sortAttribute>uid</sortAttribute>
+      <sortType>string</sortType>
+      <value>%{filter:link(row,dn,"%s",uid)}</value>
+      <export>true</export>
+    </column>
+
     <column>
       <label>Actions</label>
       <value>%{filter:actions(dn,row,objectClass)}</value>
-- 
2.30.2