- Adapt actions to be more consistent overall

  - Add 'force localboot' option in several places
  - Change visibility of the localboot event so that it gets
    automatically displayed in places, where events are selected
    by their visibility.
  - Remove actions that don't work.
- Fix a typo in class_servGeneric.inc
(Trac: #3097/#1242)

git-svn-id: https://oss.gonicus.de/repositories/gosa/branches/2.6-lhm@14364 594d385d-05f5-0310-b6e9-bd551577e9d8

diff --git a/trunk/gosa-plugins/goto/addons/goto/events/class_DaemonEvent_localboot.inc b/trunk/gosa-plugins/goto/addons/goto/events/class_DaemonEvent_localboot.inc
index 3906c2df5feb708500a7e2fa6b2bd74016a6033e..b07802d7ec0d479ac3d5f23fffa3c28d2bd8fdd6 100644 (file)
--- a/trunk/gosa-plugins/goto/addons/goto/events/class_DaemonEvent_localboot.inc
+++ b/trunk/gosa-plugins/goto/addons/goto/events/class_DaemonEvent_localboot.inc
@@ -22,6 +22,8 @@
 
 class DaemonEvent_localboot extends DaemonEvent
 {
+  var $visible_for = SYSTEM_EVENT;
+
   public function __construct($config,$data = array())
   {
     DaemonEvent::__construct($config,$data);

diff --git a/trunk/gosa-plugins/goto/admin/ogroups/goto/class_termgroup.inc b/trunk/gosa-plugins/goto/admin/ogroups/goto/class_termgroup.inc
index 5bf886ddbced63152818a527e9f47edfe095d6a5..5ff5a1d1fee02078e6b6faa956e3d5043f1e0b3d 100644 (file)
--- a/trunk/gosa-plugins/goto/admin/ogroups/goto/class_termgroup.inc
+++ b/trunk/gosa-plugins/goto/admin/ogroups/goto/class_termgroup.inc
@@ -24,6 +24,7 @@ class termgroup extends plugin
                             "reinstall"       => "reinstall",
                             "rescan"          => "rescan",
                             "wake"            => "wakeup",
+                            "localboot"       => "localboot"
                           # These are currently not supported by the tftp daemon
                            # "memcheck"        => "memcheck",
                            # "sysinfo"         => "sysinfo"
@@ -267,7 +268,8 @@ class termgroup extends plugin
           "update" => _("Software update"),
           "wake" => _("Wake"),
           "reinstall" => _("Reinstall"),
-          "rescan" => _("Rescan hardware")
+          "rescan" => _("Rescan hardware"),
+          "localboot" => _("Force localboot")
 #          "memcheck" => _("Memory test"),
 #          "sysinfo"  => _("System analysis")
         ));

diff --git a/trunk/gosa-plugins/systems/admin/systems/class_servGeneric.inc b/trunk/gosa-plugins/systems/admin/systems/class_servGeneric.inc
index 9bfa325eb9c2e2a516340e38e961dd0e7e6a0944..1c889b7b9f7705ea49a114cb9f40e63b6418f6b0 100644 (file)
--- a/trunk/gosa-plugins/systems/admin/systems/class_servGeneric.inc
+++ b/trunk/gosa-plugins/systems/admin/systems/class_servGeneric.inc
@@ -58,12 +58,11 @@ class servgeneric extends plugin
   var $mapActions   = array("reboot"          => "",
                             "instant_update"  => "softupdate",
                             "localboot"       => "localboot",
-                            "update"          => "sceduledupdate",
+                            "update"          => "scheduledupdate",
                             "reinstall"       => "install",
                             "rescan"          => "",
                             "wakeup"            => "",
-                            "memcheck"        => "memcheck",
-                            "sysinfo"         => "sysinfo");
+                          );
 
 
   function servgeneric (&$config, $dn= NULL, $parent= NULL)
@@ -226,16 +225,14 @@ class servgeneric extends plugin
                                        "update" => _("System update"),
                                        "reinstall" => _("Reinstall"),
                                        "rescan" => _("Rescan hardware"),
-                                       "memcheck" => _("Memory test"),
                                        "localboot" => _("Force localboot"),
-                                       "sysinfo"  => _("System analysis")));
+                                     ));
     } else {
       $smarty->assign("actions", array("wakeup" => _("Wake up"),
                                        "reinstall" => _("Reinstall"),
                                        "update" => _("System update"),
-                                       "memcheck" => _("Memory test"),
-                                       "localboot" => _("Force localboot"),
-                                       "sysinfo"  => _("System analysis")));
+                                       "localboot" => _("Force localboot")
+                                     ));
     }
 
     /* Show main page */