Updated loading of kernel packages

[gosa.git] / gosa-plugins / goto / admin / systems / goto / Device / class_InstallRecipe.inc

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 b5ccec7a208a48c8323fcb182a6039cc561e0c9d..c3908a4054b6a7e992bd51c7ebdc854fa0e0dd19 100644 (file)
--- a/gosa-plugins/goto/admin/systems/goto/Device/class_InstallRecipe.inc
+++ b/gosa-plugins/goto/admin/systems/goto/Device/class_InstallRecipe.inc
@@ -155,7 +155,10 @@ class InstallRecipe extends plugin
 
         // Preset the config management method.
         if(!isset($this->installConfigManagementList[$this->installBootstrapMethod][$this->installConfigManagement])){
-            $this->installConfigManagement = key($this->installConfigManagementList[$this->installBootstrapMethod]);
+            if(isset($this->installConfigManagementList[$this->installBootstrapMethod]) && 
+                count($this->installConfigManagementList[$this->installBootstrapMethod])){
+                $this->installConfigManagement = key($this->installConfigManagementList[$this->installBootstrapMethod]);
+            }
         }
     }
 
@@ -367,10 +370,14 @@ class InstallRecipe extends plugin
 
         plugin::execute();    
         $smarty = get_smarty();
-        $smarty->assign('installTemplateList', $this->installationTemplateNames);
-        $smarty->assign('installReleaseList', $this->templateToRelease[$this->installTemplate]);
 
+        // Assign ACLs
+        foreach($this->attributes as $attr){
+            $smarty->assign("{$attr}ACL", $this->getacl($attr));
+        }
 
+        $smarty->assign('installTemplateList', $this->installationTemplateNames);
+        $smarty->assign('installReleaseList', $this->templateToRelease[$this->installTemplate]);
         $smarty->assign('timezones', $this->timezones);
         $smarty->assign('installKeyboardlayoutList', $this->installKeyboardlayoutList);
         $smarty->assign('installKernelPackageList', $this->installKernelPackageList);
@@ -518,9 +525,10 @@ class InstallRecipe extends plugin
             return;
         }
 
+        $release = preg_replace("/^[^\/]*\//","", $this->installRelease);
         $rpc = $this->config->getRpcHandle();
-        $res = $rpc->getKernelPackages($this->installRelease);
-      
+        $res = $rpc->getKernelPackages($release);
+     
         // Failed to load backend values, keep reported error and return with FALSE; 
         $this->rpcError = !$rpc->success();
         if(!$rpc->success()){
@@ -528,7 +536,8 @@ class InstallRecipe extends plugin
             msg_dialog::display(_("Error"), msgPool::rpcError($this->rpcErrorMessage), ERROR_DIALOG);
         }else{
             $this->installKernelPackageList = array();
-            foreach($res as $name){
+            foreach($res as $data){
+                $name = $data['name'];
                 $this->installKernelPackageList[$name] = $name;
             }
 
@@ -690,21 +699,20 @@ class InstallRecipe extends plugin
                     "plSection"     => array("administration"),
                     "plCategory"    => array("Device"),
                     "plProvidedAcls" => array(
-                        "member" => _("Member"),
-                        "installTemplate" => _("Installation template"),
-                        "installRelease" => _("Installation release"),
 
-                        "installBootstrapMethod" => _("Bootstrap method"),
-                        "installConfigManagement" => _("Config management"),
+                        "installRelease" => _("Release"),
+                        "installTemplate" => _("Template"),
                         "installKeyboardlayout" => _("Keyboard layout"),
-                        "installSystemLocale" => _("System locale"),
+                        "installSystemLocale" => _("Locale"),
                         "installTimezone" => _("Timezone"),
-                        "installTimeUTC" => _("Time"),
-                        "installNTPServer" => _("NTP-Server"),
+                        "installTimeUTC" => _("Utc"),
+                        "installNTPServer" => _("Ntp server"),
                         "installMirror" => _("Mirror"),
                         "installRootEnabled" => _("Root login enabled"),
                         "installRootPasswordHash" => _("Root password hash"),
                         "installKernelPackage" => _("Kernel package"),
+                        "installConfigManagement" => _("Config mangement"),
+                        "installBootstrapMethod" => _("Bootstrap method"),
                         "installPartitionTable" => _("Partition table")
                         )
                         )