Updated department plugin

[gosa.git] / gosa-core / plugins / admin / departments / dep-filter.xml

diff --git a/gosa-core/plugins/admin/departments/dep-filter.xml b/gosa-core/plugins/admin/departments/dep-filter.xml
index dba596a4edf12a9f30f5db0336ae78b6b3b95f52..35855aef3cdcc41dcf177b9eaf7bddc2352b14ad 100644 (file)
--- a/gosa-core/plugins/admin/departments/dep-filter.xml
+++ b/gosa-core/plugins/admin/departments/dep-filter.xml
@@ -10,22 +10,13 @@
   <search>
     <query>
       <backend>LDAP</backend>
-      <method>cat</method>
       <filter>(&amp;(objectClass=gosaDepartment)$NAME)</filter>
       <attribute>dn</attribute>
       <attribute>objectClass</attribute>
       <attribute>ou</attribute>
       <attribute>description</attribute>
     </query>
-    <query>
-      <backend>LDAP</backend>
-      <filter>(&amp;(objectClass=gosaDepartment)$NAME)</filter>
-      <attribute>dn</attribute>
-      <attribute>objectClass</attribute>
-      <attribute>ou</attribute>
-      <attribute>description</attribute>
-    </query>
-    <scope>one</scope>
+    <scope>auto</scope>
   </search>
 
   <element>
@@ -35,12 +26,16 @@
     <maxlength>60</maxlength>
     <default></default>
     <unset></unset>
-    <set>(|(ou=*$*)(dc=*$*)(c=*$*)(l=*$*))</set>
+    <set>(|(ou=*$*)(dc=*$*)(c=*$*)(l=*$*)(o=*$*))</set>
     <alphabet>false</alphabet>
     <autocomplete>
       <backend>LDAP</backend>
-      <filter>(&amp;(objectClass=gosaDepartment)(|(ou=*$NAME*)(dc=*$NAME*)(l=*$NAME*)(c=*$NAME*)))</filter>
+      <filter>(&amp;(objectClass=gosaDepartment)(|(ou=*$NAME*)(dc=*$NAME*)(l=*$NAME*)(c=*$NAME*)(o=*$NAME*)))</filter>
       <attribute>cn</attribute>
+      <attribute>dc</attribute>
+      <attribute>c</attribute>
+      <attribute>l</attribute>
+      <attribute>o</attribute>
       <frequency>0.5</frequency>
       <characters>3</characters>
     </autocomplete>