Updated check

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

diff --git a/gosa-plugins/fai/admin/fai/class_divListFai.inc b/gosa-plugins/fai/admin/fai/class_divListFai.inc
index 8acbb54b8e0cb7d5eee2f2b366bf5c8cc662c200..e736ee08a8d5733ce6532317390ad08b965a07ea 100644 (file)
--- a/gosa-plugins/fai/admin/fai/class_divListFai.inc
+++ b/gosa-plugins/fai/admin/fai/class_divListFai.inc
@@ -81,6 +81,7 @@ class divListFai extends MultiSelectWindow
 
       $smarty = get_smarty();
       $releases = $this->parent->getBranches();
+      
       $smarty->assign("allow_create", $c);
       $smarty->assign("allow_remove", $r);
       $smarty->assign("fai_release" , $releases[$this->parent->fai_release]);

diff --git a/gosa-plugins/fai/admin/fai/class_faiManagement.inc b/gosa-plugins/fai/admin/fai/class_faiManagement.inc
index 2d6c5e66d148d47421af5ea5d49a5122d02f390b..3518caf740657632d0011792d2c5e9524ec6fc2c 100644 (file)
--- a/gosa-plugins/fai/admin/fai/class_faiManagement.inc
+++ b/gosa-plugins/fai/admin/fai/class_faiManagement.inc
@@ -71,8 +71,8 @@ class faiManagement extends plugin
     }
 
     /* Set default release */
-    $this->fai_base = get_ou("faiou").$this->config->current['BASE'];
-    if(!session::is_set("fai_filter")){
+    $this->fai_base = get_ou("faiou")."ou=Direktorium,".$this->config->current['BASE'];
+    if(session::is_set("fai_filter")){
       session::set("fai_filter",array("fai_release" => $this->fai_base));
     }
 
@@ -904,7 +904,7 @@ class faiManagement extends plugin
 
     /* Display dialog with system list */
     $this->reload();
-    $this->DivListFai->parent = $this;
+    $this->DivListFai->parent = &$this;
     $this->DivListFai->execute();
     $this->DivListFai->setEntries($this->objects);
     return($this->DivListFai->Draw());
@@ -940,7 +940,7 @@ class faiManagement extends plugin
 
     /* Ensure that we have a valid release selected */
     if(!in_array($this->fai_release,$ret)){
-      $this->fai_release = $this->fai_base;
+     # $this->fai_release = $this->fai_base;
     }
 
     return ($ret);