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 f7a8e9277dd0aaac3a934b90d7154c110fb7b5f0..ce57d6de68100023c485ce11d628922bcd965f82 100644 (file)
--- 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 8d848e77b2098430c4fbb364b298b4ed79d9f5b4..b1d6dffdeab28fe1aa82c9555b20f0cd015760b7 100644 (file)
--- 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 cb71d0d06479ccbdf14f17d3104ad9bea38b537c..73f152c4232a6165ee5cbbd2e69f52ae071d679f 100644 (file)
--- 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 3e026af041aeb22922a7aca40e522c8dd66b6bd4..377f3ee385df8dc9ff42d4b31b43c6d99dee637b 100644 (file)
--- 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])){