From: hickert <hickert@594d385d-05f5-0310-b6e9-bd551577e9d8>
Date: Mon, 31 Mar 2008 07:24:31 +0000 (+0000)
Subject: Updated workstation Startup.
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=bc60299c90a8b1ad2c67217526e75a8e8e3c87a9;p=gosa.git

Updated workstation Startup.
-Do not display the "is installing message" if the systems gets activated.


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

diff --git a/gosa-plugins/goto/admin/systems/goto/class_workstationGeneric.inc b/gosa-plugins/goto/admin/systems/goto/class_workstationGeneric.inc
index 8ee8282bc..fb8347ddd 100644
--- a/gosa-plugins/goto/admin/systems/goto/class_workstationGeneric.inc
+++ b/gosa-plugins/goto/admin/systems/goto/class_workstationGeneric.inc
@@ -413,15 +413,6 @@ class workgeneric extends plugin
     /* Call common method to give check the hook */
     $message= plugin::check();
  
-    /* Only systems with a valid ldap handle can be activated 
-     */
-    if($this->gotoMode == "active" && $this->initial_gotoMode != "active"){
-     
-      if(isset($this->parent->by_object['workstartup']) && !count($this->parent->by_object['workstartup']->gotoLdapServers)){
-        $message[] = _("In order to activate this system a valid ldap handle is required, please select at least one ldap URI in the workstation startup tab.");
-      }
-    }
- 
     /* Skip IP & Mac checks if this is a template */
     if($this->cn != "wdefault"){
       $message= array_merge($message, $this->netConfigDNS->check());
@@ -466,12 +457,21 @@ class workgeneric extends plugin
       $message[]= msgPool::required(_("NTP server"));
     }
 
-    /* Warn the user, that this host is currently installing */
-    if($this->currently_installing && !$this->currently_installing_warned){
-      $this->currently_installing_warned = TRUE;
-      $message[] = _("This host is currently installing, if you really want to save it, save again.");
-    }
+    /* Only systems with a valid ldap handle can be activated 
+     */
+    if($this->gotoMode == "active" && $this->initial_gotoMode != "active"){
 
+      if(isset($this->parent->by_object['workstartup']) && !count($this->parent->by_object['workstartup']->gotoLdapServers)){
+        $message[] = _("In order to activate this system a valid ldap handle is required, please select at least one ldap URI in the workstation startup tab.");
+      }
+    }else{
+      /* Warn the user, that this host is currently installing */
+      if($this->currently_installing && !$this->currently_installing_warned){
+        $this->currently_installing_warned = TRUE;
+        $message[] = _("This host is currently installing, if you really want to save it, save again.");
+      }
+    }
+  
     return ($message);
   }