Only close filterEditor if necessary

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

diff --git a/gosa-core/include/class_management.inc b/gosa-core/include/class_management.inc
index af5c4c01698f4ee8051a1d95474981f0236a5411..1cc964db6e3cb0905bf37a36ca4d0a9dc20d7075 100644 (file)
--- 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()