Updated user and department filiter

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

diff --git a/gosa-core/plugins/admin/departments/dep-filter.tpl b/gosa-core/plugins/admin/departments/dep-filter.tpl
deleted file mode 100644 (file)
index 3d47da6..0000000
--- a/gosa-core/plugins/admin/departments/dep-filter.tpl
+++ /dev/null
@@ -1,29 +0,0 @@
-<div class="contentboxh">
- <p class="contentboxh">
-  <img src="images/launch.png" align="right" alt="[F]">{t}Filter{/t}
- </p>
-</div>
-
-<div class="contentboxb">
-
- <table summary='{t}Filter options{/t}' style="width:100%;border-top:1px solid #B0B0B0;">
-  <tr>
-   <td>
-    <label for="NAME">
-     <img src="images/lists/search.png" align=middle>&nbsp;Name
-    </label>
-   </td>
-   <td>
-    {$NAME}
-   </td>
-  </tr>
- </table>
-
- <table summary='{t}Filter options{/t}'  width="100%"  style="background:#EEEEEE;border-top:1px solid #B0B0B0;">
-  <tr>
-   <td width="100%" align="right">
-    {$APPLY}
-   </td>
-  </tr>
- </table>
-</div>

diff --git a/gosa-core/plugins/admin/departments/dep-filter.xml b/gosa-core/plugins/admin/departments/dep-filter.xml
index a9f2479f66888e7aeef0ca628e2d334e1096d4fc..505b1fdfba3f4ed43ef5d3663966929df74e6a86 100644 (file)
--- a/gosa-core/plugins/admin/departments/dep-filter.xml
+++ b/gosa-core/plugins/admin/departments/dep-filter.xml
@@ -2,7 +2,6 @@
 
 <filterdef>
   <definition>
-    <category>department</category>
     <initial>true</initial>
     <default>default</default>
     <scope>auto</scope>
@@ -12,6 +11,7 @@
     <tag>default</tag>
     <label>Default filter</label>
     <query>
+      <storage></storage>
       <backend>LDAP</backend>
       <filter>(&amp;(objectClass=gosaDepartment)(|(dc=$)(ou=$)(o=$)(l=$)(c=$)))</filter>
       <attribute>dn</attribute>

diff --git a/gosa-core/plugins/admin/users/user-filter.xml b/gosa-core/plugins/admin/users/user-filter.xml
index d9b18939a31ad854d870086f39b1e60a895c5017..78286cadf88ed50344ae0cbea93646cc526982b7 100644 (file)
--- a/gosa-core/plugins/admin/users/user-filter.xml
+++ b/gosa-core/plugins/admin/users/user-filter.xml
@@ -2,7 +2,6 @@
 
 <filterdef>
   <definition>
-    <category>users</category>
     <initial>true</initial>
     <default>default</default>
     <scope>auto</scope>
@@ -12,6 +11,7 @@
     <tag>default</tag>
     <label>Default filter</label>
     <query>
+      <storage>userRDN</storage>
       <backend>LDAP</backend>
       <filter>(&amp;(objectClass=gosaAccount)(|(cn=$)(sn=$)(uid=$)))</filter>
       <attribute>dn</attribute>
@@ -32,6 +32,7 @@
     <tag>template</tag>
     <label>Show templates</label>
     <query>
+      <storage>userRDN</storage>
       <backend>LDAP</backend>
       <filter>(&amp;(objectClass=gosaUserTemplate)(|(cn=$)(sn=$)(uid=$)))</filter>
       <attribute>dn</attribute>