From: hickert Date: Fri, 28 Mar 2008 06:37:11 +0000 (+0000) Subject: Updated workstation Startup X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=0dcc6c087dc8dd771499e21a7293cf4773d600f3;p=gosa.git Updated workstation Startup -Added Retry button in case of an error with the si server communication git-svn-id: https://oss.gonicus.de/repositories/gosa/trunk@10050 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 f8b151beb..1f7fbf73d 100644 --- a/gosa-plugins/goto/admin/systems/goto/class_workstationStartup.inc +++ b/gosa-plugins/goto/admin/systems/goto/class_workstationStartup.inc @@ -1077,10 +1077,13 @@ class workstartup extends plugin function update_fai_cache($first_call = FALSE) { $force = FALSE; - $this->si_fai_action_failed = FALSE; if(!$this->si_active) return; $start = microtime(TRUE); + if($this->si_fai_action_failed && !isset($_POST['fai_si_retry'])) return; + + $this->si_fai_action_failed = FALSE; + /* Get the list of available servers and their releases. */ if($force || !isset($this->cache['SERVERS'])){ diff --git a/gosa-plugins/goto/admin/systems/goto/workstationStartup.tpl b/gosa-plugins/goto/admin/systems/goto/workstationStartup.tpl index 73d0a2f63..6bb8bbc29 100644 --- a/gosa-plugins/goto/admin/systems/goto/workstationStartup.tpl +++ b/gosa-plugins/goto/admin/systems/goto/workstationStartup.tpl @@ -64,6 +64,7 @@ {elseif $si_fai_action_failed} {msgPool type=siError}
{t}Check if the GOsa support daemon (gosa-si) is running.{/t} + {elseif $fai_activated} {if $FAIdebianMirror == "inherited"}