X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;ds=sidebyside;f=gosa-core%2Fplugins%2Fadmin%2Fusers%2Fuser-filter.xml;h=8dbe2590d7e1153f2fa0e6aabbb17e9d78418fe3;hb=3cff5e9177aac53e8ed80881211d0d290da5070d;hp=d39e8be23044a51e93b4855e481d353551db010e;hpb=16aed6383f913d54ec9bdabff9546d9d128ad31c;p=gosa.git

diff --git a/gosa-core/plugins/admin/users/user-filter.xml b/gosa-core/plugins/admin/users/user-filter.xml
index d39e8be23..8dbe2590d 100644
--- a/gosa-core/plugins/admin/users/user-filter.xml
+++ b/gosa-core/plugins/admin/users/user-filter.xml
@@ -2,7 +2,7 @@
 
 <filter>
   <definition>
-    <target>users</target>
+    <category>users</category>
     <template>user-filter.tpl</template>
     <initial>true</initial>
   </definition>
@@ -13,22 +13,23 @@
       <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>
+      <attribute>userPassword</attribute>
     </query>
     <query>
       <backend>LDAP</backend>
       <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>
+      <attribute>userPassword</attribute>
     </query>
-    <base>false</base>
     <scope>auto</scope>
   </search>
 
@@ -46,6 +47,7 @@
       <attribute>cn</attribute>
       <frequency>0.5</frequency>
       <characters>3</characters>
+      <objectStorage></objectStorage>
     </autocomplete>
   </element>
 
@@ -97,8 +99,7 @@
     <default>*</default>
     <value>
       <key>*</key>
-      <set>All</set>
-      <set xml:lang="de">Alle</set>
+      <label>All</label>
     </value>
     <autocomplete>
       <backend>LDAP</backend>
@@ -109,49 +110,8 @@
       <filter>(objectClass=organizationalRole)</filter>
       <attribute>cn</attribute>
       <key>cn</key>
+      <objectStorage></objectStorage>
     </autocomplete>
    </element>
 
 </filter>
-
-<list>
-  <definition>
-    <departmentBrowser>true</departmentBrowser>
-    <baseSelector>true</baseSelector>
-    <departmentRootVisible>false</departmentRootVisible>
-    <multiSelect>true</multiSelect>
-  </definition>
-
-  <table>
-    <!--<oddColor></oddColor>
-    <evenColor></evenColor>-->
-    <layout>|20px|20px|95%|5%;r|</layout>
-
-    <column>
-      <value>%{filter:objectType(objectClass)}</value>
-    </column>
-
-    <column>
-      <header>Name / Department</header>
-      <header xml:lang="de">Name / Organisationseinheit</header>
-      <sortable>true</sortable>
-      <value>%sn, %givenName [%uid]</value>
-    </column>
-
-    <column>
-      <header>Properties</header>
-      <header xml:lang="de">Eigenschaften</header>
-      <sortable>false</sortable>
-      <value>%{filter:accountProperties(objectClass)}</value>
-    </column>
-
-    <column>
-      <header>Actions</header>
-      <header xml:lang="de">Aktionen</header>
-      <sortable>false</sortable>
-      <value>%{filter:actions}</value>
-    </column>
-
-  </table>
-
-</list>