From: wolffc <wolffc@594d385d-05f5-0310-b6e9-bd551577e9d8>
Date: Fri, 10 Sep 2010 09:28:21 +0000 (+0000)
Subject: Make sure delete actions are properly cancelled by calling the
X-Git-Url: https://git.tokkee.org/?p=gosa.git;a=commitdiff_plain;h=cd9e1ee486f11dd76f0afec43a7039bb44cf151a

Make sure delete actions are properly cancelled by calling the
"Delete MULTIPLE entries Canceled" code path and not the "Delete
confirm dialog" code path. Also, properly delete confirm dialog once
cancelled.


git-svn-id: https://oss.gonicus.de/repositories/gosa/branches/2.6-lhm@19594 594d385d-05f5-0310-b6e9-bd551577e9d8
---

diff --git a/trunk/gosa-plugins/fai/admin/fai/class_faiManagement.inc b/trunk/gosa-plugins/fai/admin/fai/class_faiManagement.inc
index 31c3aec89..3fd299e6b 100644
--- a/trunk/gosa-plugins/fai/admin/fai/class_faiManagement.inc
+++ b/trunk/gosa-plugins/fai/admin/fai/class_faiManagement.inc
@@ -357,7 +357,9 @@ class faiManagement extends plugin
      ****************/
 
     if ($s_action=="del_multiple" || 
-        $this->dialog instanceOf faiGroupHandle && $this->dialog->get_mode() == "remove"){
+        $this->dialog instanceOf faiGroupHandle && 
+        $this->dialog->get_mode() == "remove" &&
+        !isset($_POST['delete_multiple_fai_object_cancel'])){
  
       /* Collect objects to delete and check if objects are freezed
        */ 
@@ -421,6 +423,7 @@ class faiManagement extends plugin
     if(isset($_POST['delete_multiple_fai_object_cancel'])){
       $this->remove_lock();
       $this->dns = array();
+      $this->dialog = FALSE;
     }
 
     /****************