From a4166c3b044fdf83bb57be8d6e0df02a1d012bf8 Mon Sep 17 00:00:00 2001 From: psc Date: Tue, 23 Feb 2010 16:46:43 +0000 Subject: [PATCH] Apply fix for #3672 - When getting a list of departments do consider the unittag and honour unittag configuration. - When getting a list of hotplug devices filter them by the unittag of the user, so that only devices with the same gosa unittag are used. git-svn-id: https://oss.gonicus.de/repositories/gosa/branches/2.6-lhm@15679 594d385d-05f5-0310-b6e9-bd551577e9d8 --- trunk/gosa-core/include/class_config.inc | 2 +- .../goto/personal/environment/class_hotplugDialog.inc | 7 ++++++- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/trunk/gosa-core/include/class_config.inc b/trunk/gosa-core/include/class_config.inc index 2338ce7aa..1185d28d0 100644 --- a/trunk/gosa-core/include/class_config.inc +++ b/trunk/gosa-core/include/class_config.inc @@ -792,7 +792,7 @@ class config { $this->tdepartments[$val] != $ui->gosaUnitTag){ #TODO: link with strict* - #continue; + continue; } } diff --git a/trunk/gosa-plugins/goto/personal/environment/class_hotplugDialog.inc b/trunk/gosa-plugins/goto/personal/environment/class_hotplugDialog.inc index 2fd7c342e..04a6c21c1 100644 --- a/trunk/gosa-plugins/goto/personal/environment/class_hotplugDialog.inc +++ b/trunk/gosa-plugins/goto/personal/environment/class_hotplugDialog.inc @@ -84,9 +84,10 @@ class hotplugDialog extends plugin function getHotplugs() { + $ui = get_userinfo(); $filter = "(&(objectClass=gotoDevice)(|(cn=".$this->regex.")(description=".$this->regex.")))"; $base = get_ou('deviceRDN').$this->depselect; - $attrs = array("gotoHotplugDevice", "cn", "dn"); + $attrs = array("gotoHotplugDevice", "cn", "dn", "gosaUnitTag"); $cat = "devices"; if ($this->subtree) { @@ -98,6 +99,10 @@ class hotplugDialog extends plugin $a_return = array(); $this->hotplugDeviceList = array(); foreach ($res as $device) { + /* Skip devices with a different unittag as those of the user */ + if ($device['gosaUnitTag'][0] != $ui->gosaUnitTag) { + continue; + } if(isset($device['gotoHotplugDevice'][0])){ -- 2.30.2