From: hickert <hickert@594d385d-05f5-0310-b6e9-bd551577e9d8>
Date: Tue, 13 Apr 2010 13:32:34 +0000 (+0000)
Subject: Fixed dialog handling
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=4c9b6cd5ae6c51c9eaacf4b938d3560188cb4c7c;p=gosa.git

Fixed dialog handling


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

diff --git a/gosa-core/plugins/admin/groups/class_group.inc b/gosa-core/plugins/admin/groups/class_group.inc
index 4cfed80c3..c50f206bf 100644
--- a/gosa-core/plugins/admin/groups/class_group.inc
+++ b/gosa-core/plugins/admin/groups/class_group.inc
@@ -244,13 +244,11 @@ class group extends plugin
     /* Add objects? */
     if (isset($_POST["edit_membership"]) && preg_match("/w/",$this->getacl("memberUid"))){
       $this->userSelect= new userSelect($this->config, get_userinfo());
-      $this->dialog= TRUE;
     }
 
     /* Add objects finished? */
     if (isset($_POST["add_users_cancel"])){
       $this->userSelect= NULL;
-      $this->dialog= FALSE;
     }
 
     /* Add user to group */
@@ -268,39 +266,17 @@ class group extends plugin
         }
       }
       $this->userSelect= NULL;
-      $this->dialog= FALSE;
-    }
-
-    /* Dialog handling */
-    if(is_object($this->dialog)){
-      /* Must be called before save_object */
-      $this->dialog->save_object();
-
-      if($this->dialog->isClosed()){
-        $this->dialog = false;
-      }elseif($this->dialog->isSelected()){
-
-        /* Check if selected base is valid */
-        $tmp = $this->get_allowed_bases();
-        if(isset($tmp[$this->dialog->isSelected()])){
-          $this->base = $this->dialog->isSelected();
-        }
-        $this->dialog= false;
-      }else{
-        return($this->dialog->execute());
-      }
     }
 
     $smarty= get_smarty();
-
+ 
     // Handle trust mode dialog
+    $this->dialog = FALSE;
     $trustModeDialog = $this->trustModeDialog->execute();
     if($this->trustModeDialog->trustSelect){
         $this->dialog = TRUE;
         return($trustModeDialog);
-
     }
-    $this->dialog = FALSE;
     $smarty->assign("trustModeDialog" , $trustModeDialog);
 
     $smarty->assign("usePrototype", "true");
@@ -319,6 +295,7 @@ class group extends plugin
 
     /* Manage object add dialog */
     if ($this->userSelect){
+      $this->dialog = TRUE;
       return($this->userSelect->execute());
     }