From: hickert <hickert@594d385d-05f5-0310-b6e9-bd551577e9d8>
Date: Thu, 7 Oct 2010 08:07:11 +0000 (+0000)
Subject: Updated Installation method handling
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=871da94ee124c277cc360bea5e06c0dd44ef632e;p=gosa.git

Updated Installation method handling
-Fixed problem with selection of invalid installation methods


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

diff --git a/gosa-plugins/goto/admin/systems/goto/Config/class_DeviceConfig.inc b/gosa-plugins/goto/admin/systems/goto/Config/class_DeviceConfig.inc
index 19f1a37b3..2d02c531c 100644
--- a/gosa-plugins/goto/admin/systems/goto/Config/class_DeviceConfig.inc
+++ b/gosa-plugins/goto/admin/systems/goto/Config/class_DeviceConfig.inc
@@ -74,16 +74,15 @@ class DeviceConfig extends management
     {
         $this->is_account = FALSE;
         if(!isset($this->allItemConfigurations[$str])){
-            trigger_error("Invalid install method '{$str}'!");
             $this->itemConfig = array();
             $this->invalidInstallMethod =TRUE;
             $this->errorMessage = sprintf(_("Invalid installation method selected '%s'!"), $str);
+            msg_dialog::display(_("Setup"), $this->errorMessage, ERROR_DIALOG);
+            return(FALSE);
         }else{
 
             $this->itemConfig = $this->allItemConfigurations[$str]['items'];
             $this->invalidInstallMethod =FALSE;
-
-            // Load the template 
             $this->TemplateEngine->load($this->itemConfig);
 
             // Detect root item, its name is / 
@@ -95,11 +94,11 @@ class DeviceConfig extends management
                 }
             }
             if(!$root){
-                $this->errorMessage = _("No valid install methods returned, missing root object!");
+                $this->errorMessage = sprintf(_("Installation method '%s' is invalid, no root object found!"), $str);
                 msg_dialog::display(_("Setup"), $this->errorMessage , ERROR_DIALOG);
                 $this->initFailed = TRUE;
                 $this->itemConfig = array();
-                return;
+                return(FALSE);
             }
 
             // Set current item to 'root', this is the minimum to get things running.
@@ -109,6 +108,7 @@ class DeviceConfig extends management
             $this->setSelectedListItemID($idRoot);
             $this->is_account = TRUE;
             $this->rebuildListing();
+            return(TRUE);
         }
     }