From fbdba87f8c4affd6459e7f6f85482523f8608138 Mon Sep 17 00:00:00 2001
From: cajus <cajus@594d385d-05f5-0310-b6e9-bd551577e9d8>
Date: Thu, 4 Feb 2010 14:11:54 +0000
Subject: [PATCH] Updated templates

git-svn-id: https://oss.gonicus.de/repositories/gosa/trunk@15586 594d385d-05f5-0310-b6e9-bd551577e9d8
---
 .../groups/userGroupSelect/selectUserGroup-filter.xml  |  4 ++--
 .../groups/userGroupSelect/selectUserGroup-list.xml    | 10 +++++++++-
 .../plugins/admin/groups/userSelect/user-filter.xml    |  4 ++--
 .../plugins/admin/groups/userSelect/user-list.xml      | 10 +++++++++-
 4 files changed, 22 insertions(+), 6 deletions(-)

diff --git a/gosa-core/plugins/admin/groups/userGroupSelect/selectUserGroup-filter.xml b/gosa-core/plugins/admin/groups/userGroupSelect/selectUserGroup-filter.xml
index 396b912a9..d073056de 100644
--- a/gosa-core/plugins/admin/groups/userGroupSelect/selectUserGroup-filter.xml
+++ b/gosa-core/plugins/admin/groups/userGroupSelect/selectUserGroup-filter.xml
@@ -30,11 +30,11 @@
     <maxlength>60</maxlength>
     <default></default>
     <unset></unset>
-    <set>(|(cn=*$*)(sn=*$*)(givenName=*$*))</set>
+    <set>(|(cn=*$*)(sn=*$*)(givenName=*$*)(uid=*$*))</set>
     <alphabet>true</alphabet>
     <autocomplete>
       <backend>LDAPBlacklist</backend>
-      <filter>(&amp;(objectClass=gosaAccount)(|(cn=*$NAME*)(sn=*$NAME*)(givenName=*$NAME*)))</filter>
+      <filter>(&amp;(objectClass=gosaAccount)(|(cn=*$NAME*)(sn=*$NAME*)(givenName=*$NAME*)(uid=*$NAME*)))</filter>
       <attribute>cn</attribute>
       <frequency>0.5</frequency>
       <characters>3</characters>
diff --git a/gosa-core/plugins/admin/groups/userGroupSelect/selectUserGroup-list.xml b/gosa-core/plugins/admin/groups/userGroupSelect/selectUserGroup-list.xml
index 9b126f520..05ae632bd 100644
--- a/gosa-core/plugins/admin/groups/userGroupSelect/selectUserGroup-list.xml
+++ b/gosa-core/plugins/admin/groups/userGroupSelect/selectUserGroup-list.xml
@@ -30,7 +30,7 @@
   </definition>
 
   <table>
-    <layout>|20px;c|220px||</layout>
+    <layout>|20px;c|||[200px]</layout>
 
     <department>
       <value>%{filter:objectType(dn,objectClass)}</value>
@@ -61,6 +61,14 @@
       <export>true</export>
     </column>
 
+    <column>
+      <label>Login</label>
+      <sortAttribute>uid</sortAttribute>
+      <sortType>string</sortType>
+      <value>%{uid}</value>
+      <export>true</export>
+    </column>
+
   </table>
 
   <actionmenu>
diff --git a/gosa-core/plugins/admin/groups/userSelect/user-filter.xml b/gosa-core/plugins/admin/groups/userSelect/user-filter.xml
index a9bc8f7a0..ccfb3bda3 100644
--- a/gosa-core/plugins/admin/groups/userSelect/user-filter.xml
+++ b/gosa-core/plugins/admin/groups/userSelect/user-filter.xml
@@ -29,11 +29,11 @@
     <maxlength>60</maxlength>
     <default></default>
     <unset></unset>
-    <set>(|(sn=*$*)(givenName=*$*)(cn=*$*))</set>
+    <set>(|(sn=*$*)(givenName=*$*)(cn=*$*)(uid=*$*))</set>
     <alphabet>true</alphabet>
     <autocomplete>
       <backend>LDAPBlacklist</backend>
-      <filter>(&amp;(objectClass=gosaAccount)(|(sn=*$NAME*)(givenName=*$NAME*)(cn=*$NAME*)))</filter>
+      <filter>(&amp;(objectClass=gosaAccount)(|(sn=*$NAME*)(givenName=*$NAME*)(cn=*$NAME*)(uid=*$NAME*)))</filter>
       <attribute>cn</attribute>
       <frequency>0.5</frequency>
       <characters>3</characters>
diff --git a/gosa-core/plugins/admin/groups/userSelect/user-list.xml b/gosa-core/plugins/admin/groups/userSelect/user-list.xml
index 1a8175ccc..c26368ce5 100644
--- a/gosa-core/plugins/admin/groups/userSelect/user-list.xml
+++ b/gosa-core/plugins/admin/groups/userSelect/user-list.xml
@@ -21,7 +21,7 @@
   </definition>
 
   <table>
-    <layout>|20px;c|||</layout>
+    <layout>|20px;c||||</layout>
 
     <department>
       <value>%{filter:objectType(dn,objectClass)}</value>
@@ -52,6 +52,14 @@
       <export>true</export>
     </column>
 
+    <column>
+      <label>Login</label>
+      <sortAttribute>uid</sortAttribute>
+      <sortType>string</sortType>
+      <value>%{uid}</value>
+      <export>true</export>
+    </column>
+
   </table>
 
   <actionmenu>
-- 
2.30.2