X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=include%2Fclass_MultiSelectWindow.inc;h=c1faef3600058bae7d03ef429d015b294b214662;hb=b4d64161d920fb20e0337ab76793ec973e52d297;hp=a5bccb58913a406e6598f8c6659324e325318663;hpb=b32c3dcefffa3bd4ae4b1edfb8b5b7d3e82cd424;p=gosa.git
diff --git a/include/class_MultiSelectWindow.inc b/include/class_MultiSelectWindow.inc
index a5bccb589..c1faef360 100644
--- a/include/class_MultiSelectWindow.inc
+++ b/include/class_MultiSelectWindow.inc
@@ -34,6 +34,7 @@ class MultiSelectWindow{
var $HideFilterPart = false;
var $SaveAdditionalVars = array(); // Additional Post vars to store
+ var $module= "";
function ClearElementsList()
{
@@ -72,9 +73,10 @@ class MultiSelectWindow{
}
/* Contrucktion */
- function MultiSelectWindow($config,$filterName)
+ function MultiSelectWindow($config, $filterName, $module)
{
$this->config = $config;
+ $this->module = $module;
$this->SaveButtonString = _("Save");
$this->CloseButtonString = _("Close");
$this->filterName = $filterName;
@@ -273,7 +275,7 @@ class MultiSelectWindow{
if($box['default'] == true){
$boxes .=" ".$box['string']."
";
}else{
- $boxes .=" ".$box['string']."
";
+ $boxes .=" ".$box['string']."
";
}
}
$smarty->assign("CheckBoxes", $boxes);
@@ -360,6 +362,11 @@ class MultiSelectWindow{
Store data also into a session var, to keep the checkboxes check after reload */
function save_object()
{
+ /* Get up to date config */
+ if(isset($this->parent->config)){
+ $this->config = $this->parent->config;
+ }
+
/* Update current base */
if($this->DepartmentsAdded){
$s_action ="";
@@ -514,6 +521,8 @@ class MultiSelectWindow{
if(count($this->parent->Available_SnapsShots($dn))){
$str.= " ";
+ } else {
+ $str = "
";
}
$str.= "departments = array();
/* Get all departments within this subtree */
- $deps= get_list("(&(|(ou=*)(description=*))(objectClass=gosaDepartment))", $this->ui->subtreeACL,
- $base, array("ou", "description"), GL_SIZELIMIT | GL_CONVERT);
+ $deps= get_list("(&(|(ou=*)(description=*))(objectClass=gosaDepartment))", $this->module, $base,
+ array("ou", "description"), GL_SIZELIMIT | GL_CONVERT);
/* Edit delete link for system types
*/