From: hickert <hickert@594d385d-05f5-0310-b6e9-bd551577e9d8>
Date: Mon, 14 Jul 2008 06:51:51 +0000 (+0000)
Subject: Updated FAImanagement.
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=9b1372d00ec8ab198c2003bca8e9b8edb58d4876;p=gosa.git

Updated FAImanagement.
-Set FAIstate correctly, to avoid that freezed objects can be edited


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

diff --git a/gosa-plugins/fai/admin/fai/class_faiManagement.inc b/gosa-plugins/fai/admin/fai/class_faiManagement.inc
index 191c36bc2..b2b9a2541 100644
--- a/gosa-plugins/fai/admin/fai/class_faiManagement.inc
+++ b/gosa-plugins/fai/admin/fai/class_faiManagement.inc
@@ -432,6 +432,7 @@ class faiManagement extends plugin
 
 			$this->dialog     = new $a_setup[0]($this->config,$this->config->data['TABS'][$a_setup[2]],$this->dn,"fai");
       $this->dialog->parent = &$this;
+      $this->dialog->by_object[$a_setup[1]]->FAIstate = $entry['FAIstate'];;
       $this->dialog->set_acl_base($this->dn);
 			$this->is_dialog  = true;
 
@@ -1122,7 +1123,7 @@ class faiManagement extends plugin
           /* Append type to this string, to be able to check if the selected 
            * entry is of type 'freeze' or 'branch'
            */
-          if(!isset($object['FAIstate'])){
+#          if(!isset($object['FAIstate'])){
             
             /* Is this entry inherited from an earlier release? 
                In this case inherit the FAIstate from the release container.
@@ -1135,9 +1136,9 @@ class faiManagement extends plugin
               $obj['FAIstate'] = $this->lock_type;
             }
   
-          }else{
-            $obj['FAIstate'] = $object['FAIstate'][0]; 
-          }
+#          }else{
+#            $obj['FAIstate'] = $object['FAIstate'][0]; 
+#          }
 
           if($force_freezed && !$this->allow_freeze_object_attach){
             $obj['FAIstate'] = "freeze";