Updated ogroup object selection

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

diff --git a/gosa-core/plugins/admin/ogroups/class_ogroup.inc b/gosa-core/plugins/admin/ogroups/class_ogroup.inc
index 75e952c1438bc97882310b5f72bf8a48cb070630..bbee66f04c22dcc7bd7692fb7cf4d688a56f0084 100644 (file)
--- a/gosa-core/plugins/admin/ogroups/class_ogroup.inc
+++ b/gosa-core/plugins/admin/ogroups/class_ogroup.inc
@@ -377,6 +377,7 @@ class ogroup extends plugin
 
     /* Manage object add dialog */
     if ($this->objectSelect){
+      session::set('filterBlacklist', array('dn'=> $this->member));
       return($this->objectSelect->execute());
     }
 

diff --git a/gosa-core/plugins/admin/ogroups/objectSelect/class_filterLDAPDepartmentBlacklist.inc b/gosa-core/plugins/admin/ogroups/objectSelect/class_filterLDAPDepartmentBlacklist.inc
index 422fc1f38c8d27733d3354a451d8bb6214a60248..ff6c467eadfd4cc949910c721cd9ce5340e57163 100644 (file)
--- a/gosa-core/plugins/admin/ogroups/objectSelect/class_filterLDAPDepartmentBlacklist.inc
+++ b/gosa-core/plugins/admin/ogroups/objectSelect/class_filterLDAPDepartmentBlacklist.inc
@@ -10,7 +10,7 @@ class filterLDAPDepartmentBlacklist  extends filterLDAPBlacklist{
       $entries[$key][ $entries[$key]['count'] ]= 'cn';
       $entries[$key]['count'] ++;
     }
-    return($entries);
+    return(filterLDAPBlacklist::filterByBlacklist($entries));
   }
 }
 

diff --git a/gosa-core/plugins/admin/ogroups/objectSelect/selectObject-filter.xml b/gosa-core/plugins/admin/ogroups/objectSelect/selectObject-filter.xml
index 69e2ced02d84542fab0e2e06ec38c5fb6f72eab6..bf646d08c1a08e4865387e0eb951144e4c10eb42 100644 (file)
--- a/gosa-core/plugins/admin/ogroups/objectSelect/selectObject-filter.xml
+++ b/gosa-core/plugins/admin/ogroups/objectSelect/selectObject-filter.xml
@@ -60,7 +60,7 @@
   <element>
     <type>checkbox</type>
     <tag>USER</tag>
-    <default>true</default>
+    <default></default>
     <set>(&amp;(objectClass=gosaAccount)(!(objectClass=gosaUserTemplate)))</set>
     <unset></unset>
   </element>
@@ -68,7 +68,7 @@
   <element>
     <type>checkbox</type>
     <tag>GROUP</tag>
-    <default>true</default>
+    <default></default>
     <unset></unset>
     <set>(objectClass=posixGroup)</set>
   </element>
@@ -76,7 +76,7 @@
   <element>
     <type>checkbox</type>
     <tag>DEPARTMENT</tag>
-    <default>true</default>
+    <default></default>
     <unset></unset>
     <set>(objectClass=gosaDepartment)</set>
   </element>
@@ -84,7 +84,7 @@
   <element>
     <type>checkbox</type>
     <tag>SERVER</tag>
-    <default>true</default>
+    <default></default>
     <unset></unset>
     <set>(objectClass=goServer)</set>
   </element>
@@ -92,7 +92,7 @@
   <element>
     <type>checkbox</type>
     <tag>WORKSTATION</tag>
-    <default>true</default>
+    <default></default>
     <unset></unset>
     <set>(objectClass=gotoWorkstation)</set>
   </element>
@@ -100,7 +100,7 @@
   <element>
     <type>checkbox</type>
     <tag>TERMINAL</tag>
-    <default>true</default>
+    <default></default>
     <unset></unset>
     <set>(objectClass=gotoTerminal)</set>
   </element>
@@ -108,7 +108,7 @@
   <element>
     <type>checkbox</type>
     <tag>PRINTER</tag>
-    <default>true</default>
+    <default></default>
     <unset></unset>
     <set>(objectClass=gotoPrinter)</set>
   </element>
@@ -116,7 +116,7 @@
   <element>
     <type>checkbox</type>
     <tag>PHONE</tag>
-    <default>true</default>
+    <default></default>
     <unset></unset>
     <set>(objectClass=goFonHardware)</set>
   </element>