Fixed User/Group selection in printer dialog

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

diff --git a/plugins/admin/systems/class_selectUserToPrinterDialog.inc b/plugins/admin/systems/class_selectUserToPrinterDialog.inc
index 8ed9f8c3784cb3765bbdf5f428cd74c7214eb852..1f110e3557a0a91b6c03d623f988722e94bd9675 100644 (file)
--- a/plugins/admin/systems/class_selectUserToPrinterDialog.inc
+++ b/plugins/admin/systems/class_selectUserToPrinterDialog.inc
@@ -85,8 +85,9 @@ class selectUserToPrinterDialog extends plugin
 
     /* Get all departments within this subtree */
     $base = $this->config->current['BASE'];
-    $deps_res= get_list("(&(|(ou=*)(description=*))(objectClass=gosaDepartment))", array("users","groups"), $this->config->current['BASE'],
-                    array("ou", "description"), GL_SIZELIMIT | GL_SUBSEARCH);
+    $deps_res[] = array("dn"=>$this->config->current['BASE']);
+    $deps_res= array_merge($deps_res,get_list("(&(|(ou=*)(description=*))(objectClass=gosaDepartment))", array("users","groups"), $this->config->current['BASE'],
+                    array("ou", "description"), GL_SIZELIMIT | GL_SUBSEARCH));
 
     /* Load possible departments */
     $ui     = get_userinfo();
@@ -170,7 +171,7 @@ class selectUserToPrinterDialog extends plugin
     $cat    = $this->search_cat;
 
     if ($this->subtree){
-      $res= get_list($filter,$cat,$base,$attrs, GL_SUBSEARCH);
+      $res= get_list($filter,$cat,$this->depselect,$attrs, GL_SUBSEARCH);
     } else {
       $res= get_list($filter,$cat,$base,$attrs);
     }