Updated workstation startup

-updated ACLs for gotoModules && hide kernels if (!FAI || !SI || SI_FAILED)

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

diff --git a/gosa-plugins/goto/admin/systems/goto/class_workstationStartup.inc b/gosa-plugins/goto/admin/systems/goto/class_workstationStartup.inc
index 21e664edef799d2c507bc12c8bb3782b8ed5cee3..8932b8a984a5b5649414d3387978184851a063fb 100644 (file)
--- a/gosa-plugins/goto/admin/systems/goto/class_workstationStartup.inc
+++ b/gosa-plugins/goto/admin/systems/goto/class_workstationStartup.inc
@@ -261,36 +261,6 @@ class workstartup extends plugin
         $this->update_fai_cache();
       }
     }
-
-#   /* Get list of boot kernels */
-#   if (isset($this->config->data['TABS'])){
-#     $command= $this->config->search(get_class($this), "KERNELS",array('tabs'));
-#     if (!check_command($command)){
-#       $message[]= sprintf(_("Command '%s', specified as KERNELS hook for plugin '%s' doesn't seem to exist."), $command,
-#           get_class($this));
-#     } else {
-#       $fh= popen($command, "r");
-#       while (!feof($fh)) {
-#         $buffer= trim(fgets($fh, 256));
-#         if(!empty($buffer)){
-#           $name=$value = $buffer;
-#           if(preg_match("/:/",$buffer)){
-#             $name = preg_replace("/:.*$/","",$buffer);
-#             $value= preg_replace("/^.*:/","",$buffer);
-#             $this->gotoBootKernels[$name]= $name.":".$value;
-#           }else{
-#             $this->gotoBootKernels[$name]= $value;
-#           }
-#         }
-#       }
-#       pclose($fh);
-#     }
-#   }
-#
-#    /* Turn to default, if we've nothing to inherit */
-#    if (!isset($this->gotoBootKernels['default-inherited']) && $this->gotoBootKernel == "default-inherited"){
-#      $this->gotoBootKernel= "default";
-#    }
   }
 
   
@@ -328,14 +298,14 @@ class workstartup extends plugin
 
     /* Add module */
     if (isset ($_POST['add_module'])){
-      if ($_POST['module'] != "" && $this->acl_is_writeable("gotoModule")){
+      if ($_POST['module'] != "" && $this->acl_is_writeable("gotoModules")){
         $this->add_list ($this->gotoModules, $_POST['module']);
       }
     }
 
     /* Delete module */
     if (isset ($_POST['delete_module'])){
-      if (count($_POST['modules_list']) && $this->acl_is_writeable("gotoModule")){
+      if (count($_POST['modules_list']) && $this->acl_is_writeable("gotoModules")){
         $this->del_list ($this->gotoModules, $_POST['modules_list']);
       }
     }

diff --git a/gosa-plugins/goto/admin/systems/goto/workstationStartup.tpl b/gosa-plugins/goto/admin/systems/goto/workstationStartup.tpl
index cd3025fc63585f970313726addc3ea69cc2b7cb5..ed9037f2b92eec4934ab75c86873b9e20a07d11f 100644 (file)
--- a/gosa-plugins/goto/admin/systems/goto/workstationStartup.tpl
+++ b/gosa-plugins/goto/admin/systems/goto/workstationStartup.tpl
@@ -4,6 +4,7 @@
 <h2><img class="center" alt="" align="middle" src="images/penguin.png"> {t}Boot parameters{/t}</h2>
 
    <table summary="" style="width:100%">
+       {if $fai_activated && $si_active && !$si_fai_action_failed}
     <tr>
      <td><LABEL for="gotoBootKernel">{t}Boot kernel{/t}</LABEL></td>
      <td style="width:70%">
@@ -14,6 +15,7 @@
 {/render}
       </td>
     </tr>
+       {/if}
     <tr>
      <td><LABEL for="customParameters">{t}Custom options{/t}</LABEL></td>
      <td>