From: hickert <hickert@594d385d-05f5-0310-b6e9-bd551577e9d8>
Date: Tue, 16 Mar 2010 11:20:08 +0000 (+0000)
Subject: Added extra filter
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=8b5417b53d19bf64344010a9e1c646190e506722;p=gosa.git

Added extra filter


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

diff --git a/gosa-core/plugins/admin/departments/dep-filter.xml b/gosa-core/plugins/admin/departments/dep-filter.xml
index cfca00147..8505abd66 100644
--- a/gosa-core/plugins/admin/departments/dep-filter.xml
+++ b/gosa-core/plugins/admin/departments/dep-filter.xml
@@ -31,20 +31,86 @@
   </search>
 
   <search>
-    <tag>default2</tag>
-    <label>Dummy</label>
+    <tag>ou</tag>
+    <label>Organizational unit</label>
     <query>
       <backend>LDAP</backend>
-      <filter>(&amp;(objectClass=gosaDepartment)(|(dc=$)(ou=$)(o=$)(l=$)(c=$)))</filter>
+      <filter>(&amp;(objectClass=gosaDepartment)(objectClass=organizationalUnit)(ou=$))</filter>
     </query>
     <autocomplete>
       <frequency>0.5</frequency>
       <characters>3</characters>
       <attribute>ou</attribute>
-      <attribute>dc</attribute>
+    </autocomplete>
+  </search>
+
+  <search>
+    <tag>c</tag>
+    <label>Country</label>
+    <query>
+      <backend>LDAP</backend>
+      <filter>(&amp;(objectClass=gosaDepartment)(objectClass=country)(c=$))</filter>
+    </query>
+    <autocomplete>
+      <frequency>0.5</frequency>
+      <characters>3</characters>
       <attribute>c</attribute>
+    </autocomplete>
+  </search>
+
+  <search>
+    <tag>l</tag>
+    <label>Locality</label>
+    <query>
+      <backend>LDAP</backend>
+      <filter>(&amp;(objectClass=gosaDepartment)(objectClass=locality)(l=$))</filter>
+    </query>
+    <autocomplete>
+      <frequency>0.5</frequency>
+      <characters>3</characters>
       <attribute>l</attribute>
+    </autocomplete>
+  </search>
+
+  <search>
+    <tag>dc</tag>
+    <label>Domain component</label>
+    <query>
+      <backend>LDAP</backend>
+      <filter>(&amp;(objectClass=gosaDepartment)(objectClass=dcObject)(dc=$))</filter>
+    </query>
+    <autocomplete>
+      <frequency>0.5</frequency>
+      <characters>3</characters>
+      <attribute>dc</attribute>
+    </autocomplete>
+  </search>
+
+  <search>
+    <tag>o</tag>
+    <label>Organization</label>
+    <query>
+      <backend>LDAP</backend>
+      <filter>(&amp;(objectClass=gosaDepartment)(objectClass=organization)(o=$))</filter>
+    </query>
+    <autocomplete>
+      <frequency>0.5</frequency>
+      <characters>3</characters>
       <attribute>o</attribute>
     </autocomplete>
   </search>
+
+  <search>
+    <tag>domain</tag>
+    <label>Domain</label>
+    <query>
+      <backend>LDAP</backend>
+      <filter>(&amp;(objectClass=gosaDepartment)(objectClass=domain)(dc=$))</filter>
+    </query>
+    <autocomplete>
+      <frequency>0.5</frequency>
+      <characters>3</characters>
+      <attribute>dc</attribute>
+    </autocomplete>
+  </search>
 </filterdef>
diff --git a/gosa-core/plugins/admin/departments/dep-list.xml b/gosa-core/plugins/admin/departments/dep-list.xml
index 357be7302..62f547bae 100644
--- a/gosa-core/plugins/admin/departments/dep-list.xml
+++ b/gosa-core/plugins/admin/departments/dep-list.xml
@@ -94,8 +94,8 @@
 
     <action>
      <type>sub</type>
+     <image>images/lists/folder.png[new]</image>
      <label>Create</label>
-     <image>images/lists/element.png[new]</image>
 
      <action>
       <name>new_domain</name>