From 2f9437f034aeab973c5899fab661052ccbe9c3de Mon Sep 17 00:00:00 2001 From: hickert Date: Tue, 20 Nov 2007 10:14:58 +0000 Subject: [PATCH] Fixed User/Group selection in printer dialog git-svn-id: https://oss.gonicus.de/repositories/gosa/trunk@7820 594d385d-05f5-0310-b6e9-bd551577e9d8 --- plugins/admin/systems/class_selectUserToPrinterDialog.inc | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/plugins/admin/systems/class_selectUserToPrinterDialog.inc b/plugins/admin/systems/class_selectUserToPrinterDialog.inc index 8ed9f8c37..1f110e355 100644 --- 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); } -- 2.30.2