Updated config object and convert_department dn.

[gosa.git] / gosa-core / include / class_MultiSelectWindow.inc

diff --git a/gosa-core/include/class_MultiSelectWindow.inc b/gosa-core/include/class_MultiSelectWindow.inc
index 2787a80871c0cd7196e08a89702d063f32435baf..c77f07b6497d1a9e1619e30b16b17430bd96ee3c 100644 (file)
--- a/gosa-core/include/class_MultiSelectWindow.inc
+++ b/gosa-core/include/class_MultiSelectWindow.inc
@@ -63,6 +63,11 @@ class MultiSelectWindow{
 
        function ClearElementsList()
        {
+    $ui =get_userinfo();
+    $deps = $ui->get_module_departments($this->module);
+    if(!in_array($this->selectedBase, $deps)){
+      $this->selectedBase = array_shift($deps);
+    }
                $this->array_Elements = array();
        }
 
@@ -745,8 +750,11 @@ class MultiSelectWindow{
     $ids = $this->config->idepartments;
     foreach($modules as $module){
       $d = $ui->get_module_departments($module);
-      foreach($d as $department){
-        $departments[$department] = $department;
+
+      foreach($ids as $department => $desc){
+        if(in_array($department,$d)){
+          $departments[$department] = $department;
+        }
       }
     }