From: hickert Date: Mon, 14 Apr 2008 13:54:57 +0000 (+0000) Subject: Updated fai release handling X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=1be59fd8d26999b29664cf75e9bb6519c0b07625;p=gosa.git Updated fai release handling git-svn-id: https://oss.gonicus.de/repositories/gosa/trunk@10430 594d385d-05f5-0310-b6e9-bd551577e9d8 --- diff --git a/gosa-plugins/fai/admin/fai/class_faiPackage.inc b/gosa-plugins/fai/admin/fai/class_faiPackage.inc index f7a8e9277..ce57d6de6 100644 --- a/gosa-plugins/fai/admin/fai/class_faiPackage.inc +++ b/gosa-plugins/fai/admin/fai/class_faiPackage.inc @@ -388,7 +388,7 @@ class faiPackage extends plugin /* Ensure that we do not overwrite an allready existing entry */ if($this->is_new){ - $release = $this->parent->parent->fai_filter; + $release = $this->parent->parent->fai_release; $new_dn= 'cn='.$this->cn.",".get_ou('faipackageou').get_ou('faiou').$release; $res = faiManagement::check_class_name("FAIpackageList",$this->cn,$new_dn); if(isset($res[$this->cn])){ diff --git a/gosa-plugins/fai/admin/fai/class_faiPartitionTable.inc b/gosa-plugins/fai/admin/fai/class_faiPartitionTable.inc index 8d848e77b..b1d6dffde 100644 --- a/gosa-plugins/fai/admin/fai/class_faiPartitionTable.inc +++ b/gosa-plugins/fai/admin/fai/class_faiPartitionTable.inc @@ -385,7 +385,7 @@ class faiPartitionTable extends plugin /* Ensure that we do not overwrite an allready existing entry */ if($this->is_new){ - $release = $this->parent->parent->fai_filter; + $release = $this->parent->parent->fai_release; $new_dn= 'cn='.$this->cn.",".get_ou('faipartitionou').get_ou('faiou').$release; $res = faiManagement::check_class_name("FAIpartitionTable",$this->cn,$new_dn); if(isset($res[$this->cn])){ diff --git a/gosa-plugins/fai/admin/fai/class_faiProfile.inc b/gosa-plugins/fai/admin/fai/class_faiProfile.inc index cb71d0d06..73f152c42 100644 --- a/gosa-plugins/fai/admin/fai/class_faiProfile.inc +++ b/gosa-plugins/fai/admin/fai/class_faiProfile.inc @@ -396,7 +396,7 @@ class faiProfile extends plugin /* Ensure that we do not overwrite an allready existing entry */ if($this->dn == "new" || $this->cn != $this->old_cn){ - $release = $this->parent->parent->fai_filter; + $release = $this->parent->parent->fai_release; $new_dn= 'cn='.$this->cn.",".get_ou('faiprofileou').get_ou('faiou').$release; $res = faiManagement::check_class_name("FAIprofile",$this->cn,$new_dn); if(isset($res[$this->cn])){ diff --git a/gosa-plugins/fai/admin/fai/class_faiVariable.inc b/gosa-plugins/fai/admin/fai/class_faiVariable.inc index 3e026af04..377f3ee38 100644 --- a/gosa-plugins/fai/admin/fai/class_faiVariable.inc +++ b/gosa-plugins/fai/admin/fai/class_faiVariable.inc @@ -320,7 +320,7 @@ class faiVariable extends plugin /* Ensure that we do not overwrite an allready existing entry */ if($this->is_new){ - $release = $this->parent->parent->fai_filter; + $release = $this->parent->parent->fai_release; $new_dn= 'cn='.$this->cn.",".get_ou('faivariableou').get_ou('faiou').$release; $res = faiManagement::check_class_name("FAIvariable",$this->cn,$new_dn); if(isset($res[$this->cn])){