From: hickert <hickert@594d385d-05f5-0310-b6e9-bd551577e9d8>
Date: Tue, 20 Apr 2010 06:50:05 +0000 (+0000)
Subject: Updated filter handling
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=b814e0175df78fe8b964036511415e5650af251e;p=gosa.git

Updated filter handling



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

diff --git a/gosa-core/plugins/admin/ogroups/class_ogroup.inc b/gosa-core/plugins/admin/ogroups/class_ogroup.inc
index f793e779a..08e8af36c 100644
--- a/gosa-core/plugins/admin/ogroups/class_ogroup.inc
+++ b/gosa-core/plugins/admin/ogroups/class_ogroup.inc
@@ -257,54 +257,33 @@ class ogroup extends plugin
      ***********/
 
     // Handle trust mode dialog
+    $this->dialog = FALSE;
     $trustModeDialog = $this->trustModeDialog->execute();
     if($this->trustModeDialog->trustSelect){
         $this->dialog = TRUE;
         return($trustModeDialog);
     }
     $smarty->assign("trustModeDialog",$trustModeDialog);
-    $this->dialog = FALSE;
 
     /***********
      * Ende - Trusts 
      ***********/
 
 
-    /* Dialog handling */
-    if(is_object($this->dialog) && $this->acl_is_moveable()){
-      /* Must be called before save_object */
-      $this->dialog->save_object();
-
-      if($this->dialog->isClosed()){
-        $this->dialog = false;
-      }elseif($this->dialog->isSelected()){
-
-        /* A new base was selected, check if it is a valid one */
-        $tmp = $this->get_allowed_bases();
-        if(isset($tmp[$this->dialog->isSelected()])){
-          $this->base = $this->dialog->isSelected();
-        }
-        $this->dialog= false;
-      }else{
-        return($this->dialog->execute());
-      }
-    }
-
     /* Add objects? */
     if (isset($_POST["edit_membership"])){
       $this->objectSelect= new objectSelect($this->config, get_userinfo());
-      $this->dialog= TRUE;
     }
 
     /* Add objects finished? */
     if (isset($_POST["objectSelect_cancel"])){
       $this->objectSelect= FALSE;
-      $this->dialog= FALSE;
     }
 
     /* Manage object add dialog */
     if ($this->objectSelect){
       session::set('filterBlacklist', array('dn'=> $this->member));
+      $this->dialog= TRUE;
       return($this->objectSelect->execute());
     }