Updated xml files

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

diff --git a/gosa-core/plugins/admin/users/user-filter.xml b/gosa-core/plugins/admin/users/user-filter.xml
index c456cf25bfdb2f583e10c5c2ad62333d76984b69..af24103c40116f2f89559837fabd6253201af772 100644 (file)
--- a/gosa-core/plugins/admin/users/user-filter.xml
+++ b/gosa-core/plugins/admin/users/user-filter.xml
@@ -13,8 +13,8 @@
       <filter>(&amp;(!(objectClass=gosaUserTemplate))(|$GENERIC$POSIX$MAIL$SAMBA)(|(cn=$NAME)(sn=$NAME)(givenName=$NAME)(uid=$NAME)))</filter>
       <attribute>dn</attribute>
       <attribute>objectClass</attribute>
-      <attribute>cn</attribute>
-      <attribute>mail</attribute>
+      <attribute>givenName</attribute>
+      <attribute>sn</attribute>
       <attribute>uid</attribute>
       <attribute>modifyTimestamp</attribute>
     </query>
@@ -23,8 +23,8 @@
       <filter>(&amp;$TEMPLATE(|(cn=$NAME)(sn=$NAME)(givenName=$NAME)(uid=$NAME)))</filter>
       <attribute>dn</attribute>
       <attribute>objectClass</attribute>
-      <attribute>cn</attribute>
-      <attribute>mail</attribute>
+      <attribute>givenName</attribute>
+      <attribute>sn</attribute>
       <attribute>uid</attribute>
       <attribute>modifyTimestamp</attribute>
     </query>

diff --git a/gosa-core/plugins/admin/users/user-list.xml b/gosa-core/plugins/admin/users/user-list.xml
index cc3df6c0135e89487e8fa2253c41ee62fc634d93..b53c7501314d252f82f2ecf661fb77e4e0120039 100644 (file)
--- a/gosa-core/plugins/admin/users/user-list.xml
+++ b/gosa-core/plugins/admin/users/user-list.xml
@@ -8,22 +8,34 @@
     <template>user-list.tpl</template>
     <summary>List of users</summary>
     <summary xml:lang="de">Benutzerliste</summary>
+
+    <objectType>
+      <objectClass>gosaAccount</objectClass>
+      <image>plugins/users/images/select_user.png</image>
+      <priority>2</priority>
+    </objectType>
+    <objectType>
+      <objectClass>gosaUserTemplate</objectClass>
+      <priority>1</priority>
+      <image>plugins/users/images/select_template.png</image>
+    </objectType>
+
   </definition>
 
   <table>
     <!--<oddColor></oddColor>
     <evenColor></evenColor>-->
-    <layout>|20px|65%|5%|80px;r|</layout>
+    <layout>|20px||120px|80px;r|</layout>
 
     <column>
-      <value>%{filter:objectType(objectClass)}</value>
+      <value>%{filter:objectType(dn,objectClass)}</value>
     </column>
 
     <column>
       <header>Name / Department</header>
       <header xml:lang="de">Name / Organisationseinheit</header>
       <sortable>true</sortable>
-      <value>%sn, %givenName [%uid]</value>
+      <value>%{filter:link(row,pid,dn,"%s, %s [%s]",sn,givenName,uid)}</value>
     </column>
 
     <column>