From: hickert Date: Tue, 15 Apr 2008 11:56:45 +0000 (+0000) Subject: Updated check X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=46b8fe847cfbec36dd456f7d50e5d94938bf7724;p=gosa.git 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 8acbb54b8..e736ee08a 100644 --- 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 2d6c5e66d..3518caf74 100644 --- 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);