From: hickert <hickert@594d385d-05f5-0310-b6e9-bd551577e9d8>
Date: Mon, 18 Oct 2010 09:57:09 +0000 (+0000)
Subject: Updated installable device
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=66172925acfda85cecc268aea8470fa21ca7688e;p=gosa.git

Updated installable device
-Removed hard coded config management references


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

diff --git a/gosa-plugins/goto/admin/systems/goto/Device/DeviceTab.inc b/gosa-plugins/goto/admin/systems/goto/Device/DeviceTab.inc
index e713dae40..b80756eec 100644
--- a/gosa-plugins/goto/admin/systems/goto/Device/DeviceTab.inc
+++ b/gosa-plugins/goto/admin/systems/goto/Device/DeviceTab.inc
@@ -2,15 +2,6 @@
 
 class DeviceTab extends tabs
 {
-
-    function __construct(&$config, $data, $dn, $acl_category= "", $hide_refs = FALSE, $hide_acls = FALSE)
-    {
-        tabs::tabs($config, $data, $dn, $acl_category, $hide_refs, $hide_acls);
-        if(isset($this->by_object['InstallRecipe'])){
-            $this->by_object['InstallRecipe']->updateRecipeTab();
-        }
-    }
-
     function save($ignore_account= FALSE)
     {
         // Prepare object DN
diff --git a/gosa-plugins/goto/admin/systems/goto/Device/class_InstallRecipe.inc b/gosa-plugins/goto/admin/systems/goto/Device/class_InstallRecipe.inc
index d82b6520f..353dec517 100644
--- a/gosa-plugins/goto/admin/systems/goto/Device/class_InstallRecipe.inc
+++ b/gosa-plugins/goto/admin/systems/goto/Device/class_InstallRecipe.inc
@@ -296,10 +296,6 @@ class InstallRecipe extends plugin
                 }
             }
             $this->installNTPServerList->setListData($this->installNTPServer);
-
-            if($currentInstallMethod != $this->installConfigManagement){
-                $this->updateRecipeTab();
-            }
         }
         if(isset($_POST['cancelPassword'])) $this->setKickstartRootPasswordHash =false;
         if(isset($_POST['setPassword'])) {
@@ -319,72 +315,6 @@ class InstallRecipe extends plugin
     }
 
 
-    function updateRecipeTab()
-    {
-        $mode = $this->installConfigManagement;
-        if(!isset($this->recipeTabs[$mode])){
-            $this->recipeTabs[$mode] = new DeviceConfig($this->config, $this->dn);
-            $this->recipeTabs[$mode]->parent = &$this->parent;
-
-            if($this->recipeTabs[$mode]->setInstallMethod($mode)){
-
-                $class= &$this->recipeTabs[$mode];
-
-                // Add some dummy entries for testing.
-                if($mode == 'puppet'){ 
-                    $id = $class->addItem('PuppetModule','test1',
-                            array(
-                                'dependency' => array('stulle','Wurst'),
-                                'version' => '2.4-f',
-                                'name'  => 'Thundebird',
-                                'description' => 'Mozilla mail client')
-                            );
-                    $id = $class->addItem('PuppetModule','test2',
-                            array(
-                                'dependency' => array('Leipnitz','Dose'),
-                                'version' => 1,
-                                'name'  => 'Firefox',
-                                'description' => 'Test Module')
-                            );
-                    $class->setCurrentItem($id);
-                    $id = $class->addItem('PuppetTemplate','temp1',
-                            array(
-                                'name' => 'temp1',
-                                'data' => 'kekse.tpl')
-                            );
-                    $class->setCurrentItem($id);
-                    $id = $class->addItem('PuppetTemplate','tep1',
-                            array(
-                                'name' => 'tep1',
-                                'data' => 'kekse.tpl')
-                            );
-
-                    $class->setCurrentItem($class->getRootItemID());
-                }
-            }else{
-                unset($this->recipeTabs[$mode]);
-            }
-        }
-
-        // Update the recipe tab to match the selected installation method.
-        if($this->is_account && isset($this->recipeTabs[$mode])){
-
-            if(isset($this->parent->by_object['DeviceConfig']) && 
-                    $this->recipeTabs[$mode] === $this->parent->by_object['DeviceConfig']){
-                return;
-            }
-
-            $this->parent->by_name['DeviceConfig'] = $mode ;
-            $this->parent->by_object['DeviceConfig'] = &$this->recipeTabs[$mode];
-        }else{
-            if(isset($this->parent->by_name['DeviceConfig'])){
-                unset($this->parent->by_name['DeviceConfig']);
-                unset($this->parent->by_object['DeviceConfig']);
-            }
-        }
-    }
-
-
     function save()
     {
         //