From: hickert <hickert@594d385d-05f5-0310-b6e9-bd551577e9d8>
Date: Mon, 29 Mar 2010 13:35:11 +0000 (+0000)
Subject: Updated FAI removal
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=218274323771fe67608a6a99147cc2fb7eda9ba6;p=gosa.git

Updated FAI removal


git-svn-id: https://oss.gonicus.de/repositories/gosa/trunk@17357 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 384013654..07ab52571 100644
--- a/gosa-plugins/fai/admin/fai/class_faiManagement.inc
+++ b/gosa-plugins/fai/admin/fai/class_faiManagement.inc
@@ -453,9 +453,15 @@ class faiManagement extends management
         $acl  = $this->ui->get_permissions($dn,"fai/".$type[1]);
         if(preg_match("/d/",$acl)){
 
-          // Now save changes
-          $str = management::removeEntryConfirmed($action,array($dn),$all,$type[0],$type[2],"fai",$type[1]);
-          if(!empty($str)) return($str);
+          // Delete the object
+          $this->dn = $dn;
+          $tabClass = $type[0];
+          $this->tabObject= new $tabClass($this->config,$this->config->data['TABS'][$type[2]], 
+              $this->dn, "fai", true, true);
+          $this->tabObject->set_acl_base($this->dn);
+          $this->tabObject->parent = &$this;
+          $this->tabObject->by_object[$type[1]]->remove_from_parent ();
+
           FAI::save_release_changes_now();
           $to_del = FAI::clean_up_releases($dn);
           foreach($to_del as $dn){
@@ -468,6 +474,9 @@ class faiManagement extends management
         }
       }
     }
+   
+    $this->remove_lock();
+    $this->closeDialogs();
 
     /* Normally this shouldn't be reached, send some extra
        logs to notify the administrator */