From 922367f0dfcba7c1be6e6b57b393c44e7a067a7f Mon Sep 17 00:00:00 2001
From: hickert <hickert@594d385d-05f5-0310-b6e9-bd551577e9d8>
Date: Tue, 20 Apr 2010 06:54:12 +0000
Subject: [PATCH] Only close filterEditor if necessary

git-svn-id: https://oss.gonicus.de/repositories/gosa/trunk@17724 594d385d-05f5-0310-b6e9-bd551577e9d8
---
 gosa-core/include/class_management.inc | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

diff --git a/gosa-core/include/class_management.inc b/gosa-core/include/class_management.inc
index af5c4c016..1cc964db6 100644
--- a/gosa-core/include/class_management.inc
+++ b/gosa-core/include/class_management.inc
@@ -407,7 +407,7 @@ class management
     if(isset($_POST['delete_confirmed'])) $action['action'] = "removeConfirmed";   
     if(isset($_POST['delete_cancel'])) $action['action'] = "cancelDelete";   
     if(isset($_POST['saveFilter'])) $action['action'] = "saveFilter";   
-    if(isset($_POST['cancelFilter'])) $action['action'] = "cancel";   
+    if(isset($_POST['cancelFilter'])) $action['action'] = "cancelFilter";   
 
     // Detect Snapshot actions
     if(isset($_POST['CreateSnapshot'])) $action['action'] = "saveSnapshot";   
@@ -719,6 +719,16 @@ class management
   }
 
 
+  /*! \brief  Close filter dialog
+   */
+  protected function cancelFilter()
+  {
+      if($this->dialogObject instanceOf userFilter){
+          $this->remove_lock();
+          $this->closeDialogs();
+      }
+  }
+
   /*! \brief  Save filter modifcations.
    */
   protected function saveFilter()
-- 
2.30.2