Updated templates

git-svn-id: https://oss.gonicus.de/repositories/gosa/trunk@15586 594d385d-05f5-0310-b6e9-bd551577e9d8

diff --git a/gosa-core/plugins/admin/groups/userGroupSelect/selectUserGroup-filter.xml b/gosa-core/plugins/admin/groups/userGroupSelect/selectUserGroup-filter.xml
index 396b912a968c29a10c15e7ef496073d27ce3c32c..d073056dee7e62d5518331d63128a5ae254a2eb6 100644 (file)
--- 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 9b126f5207925d1c96e4f00f032e8e0a28956173..05ae632bd375e47c3eb710cf4cb56968746c456f 100644 (file)
--- 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 a9bc8f7a0d09bdd5c19789a89094a7cf5c93b5b2..ccfb3bda37538460f496cb2765215bd164a44265 100644 (file)
--- 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 1a8175ccc1435b10063abef342c9256a8b894ba9..c26368ce525273e761010239a31497178d7c4fec 100644 (file)
--- 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>