From 2d02af2fba50f3bfae40c3dced318ab2f003764f Mon Sep 17 00:00:00 2001 From: hickert Date: Thu, 12 Jan 2012 09:49:10 +0000 Subject: [PATCH] Updated goto plugins to hide gosa-si actions until the gosaSupportURI is defined. git-svn-id: https://oss.gonicus.de/repositories/gosa/branches/2.6@21100 594d385d-05f5-0310-b6e9-bd551577e9d8 --- gosa-plugins/goto/admin/systems/goto/class_terminalGeneric.inc | 3 +++ .../goto/admin/systems/goto/class_workstationGeneric.inc | 3 +++ gosa-plugins/goto/admin/systems/goto/terminal.tpl | 2 +- gosa-plugins/goto/admin/systems/goto/workstation.tpl | 2 +- 4 files changed, 8 insertions(+), 2 deletions(-) diff --git a/gosa-plugins/goto/admin/systems/goto/class_terminalGeneric.inc b/gosa-plugins/goto/admin/systems/goto/class_terminalGeneric.inc index be20302d1..3290572e4 100644 --- a/gosa-plugins/goto/admin/systems/goto/class_terminalGeneric.inc +++ b/gosa-plugins/goto/admin/systems/goto/class_terminalGeneric.inc @@ -294,6 +294,9 @@ class termgeneric extends plugin $smarty->assign("ntpservers", $tmp); $smarty->assign("fai_activated",$this->fai_activated); + $si_url = $this->config->get_cfg_value("gosaSupportURI"); + $smarty->assign("si_activated",!empty($si_url)); + /* Variables */ foreach(array("gotoMode", "gotoTerminalPath", "gotoSwapServer","gotoSyslogServer", "gotoNtpServer") as $val){ $smarty->assign($val."_select", $this->$val); diff --git a/gosa-plugins/goto/admin/systems/goto/class_workstationGeneric.inc b/gosa-plugins/goto/admin/systems/goto/class_workstationGeneric.inc index 0a373ce8e..1c23d3da6 100644 --- a/gosa-plugins/goto/admin/systems/goto/class_workstationGeneric.inc +++ b/gosa-plugins/goto/admin/systems/goto/class_workstationGeneric.inc @@ -297,6 +297,9 @@ class workgeneric extends plugin $smarty->assign("syslogservers", $this->gotoSyslogServers); $smarty->assign("fai_activated",$this->fai_activated); + $si_url = $this->config->get_cfg_value("gosaSupportURI"); + $smarty->assign("si_activated",!empty($si_url)); + $ntpser = array(); foreach($this->gotoNtpServers as $server){ if(!in_array_strict($server,$this->gotoNtpServer)){ diff --git a/gosa-plugins/goto/admin/systems/goto/terminal.tpl b/gosa-plugins/goto/admin/systems/goto/terminal.tpl index d5e6e81e2..8e15dd415 100644 --- a/gosa-plugins/goto/admin/systems/goto/terminal.tpl +++ b/gosa-plugins/goto/admin/systems/goto/terminal.tpl @@ -146,7 +146,7 @@
- {if $fai_activated} + {if $fai_activated && $si_activated}

{t}Action{/t}

diff --git a/gosa-plugins/goto/admin/systems/goto/workstation.tpl b/gosa-plugins/goto/admin/systems/goto/workstation.tpl index 8e9a09997..55cf69567 100644 --- a/gosa-plugins/goto/admin/systems/goto/workstation.tpl +++ b/gosa-plugins/goto/admin/systems/goto/workstation.tpl @@ -121,7 +121,7 @@ {/if}

 

-{if $fai_activated} +{if $fai_activated && $si_activated}

{t}Action{/t}

-- 2.30.2