From 298af92bf91f4c6204c724dbfdc2d12645dbfd28 Mon Sep 17 00:00:00 2001 From: psc Date: Mon, 28 Sep 2009 09:29:06 +0000 Subject: [PATCH] - 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 --- .../goto/events/class_DaemonEvent_localboot.inc | 2 ++ .../goto/admin/ogroups/goto/class_termgroup.inc | 4 +++- .../systems/admin/systems/class_servGeneric.inc | 13 +++++-------- 3 files changed, 10 insertions(+), 9 deletions(-) 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 3906c2df5..b07802d7e 100644 --- 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 5bf886ddb..5ff5a1d1f 100644 --- 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 9bfa325eb..1c889b7b9 100644 --- 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 */ -- 2.30.2