From: hickert <hickert@594d385d-05f5-0310-b6e9-bd551577e9d8>
Date: Thu, 12 Jul 2007 09:33:50 +0000 (+0000)
Subject: Updated workstation inherit funktion to include generic settings;
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=1a3a0c47d4933da0110a8020caf5e5aa0ad0f324;p=gosa.git

Updated workstation inherit funktion to include generic settings;


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

diff --git a/plugins/admin/systems/class_workstationGeneric.inc b/plugins/admin/systems/class_workstationGeneric.inc
index 42029b613..5863ed5f4 100644
--- a/plugins/admin/systems/class_workstationGeneric.inc
+++ b/plugins/admin/systems/class_workstationGeneric.inc
@@ -328,10 +328,6 @@ class workgeneric extends plugin
   {
     plugin::save_object();
 
-    if(isset($_POST["inheritAll"])){
-      $this->set_everything_to_inherited();
-    }
-
     /* Save base, since this is no LDAP attribute */
     if (isset($_POST['base']) && chkacl($this->acl, "create") == ""){
       $this->base= $_POST['base'];
@@ -346,6 +342,10 @@ class workgeneric extends plugin
         $this->inheritTimeServer = false;
       }
     }
+
+    if(isset($_POST["inheritAll"])){
+      $this->set_everything_to_inherited();
+    }
   }
 
 
@@ -498,6 +498,9 @@ class workgeneric extends plugin
 
   function set_everything_to_inherited()
   {
+    $this->gotoSyslogServer  = "default";
+    $this->inheritTimeServer = TRUE;
+
     /* Set workstation service attributes to inherited */
     if($this->member_of_ogroup && isset($this->parent->by_object['workservice'])){
       foreach(array("gotoXKbLayout","gotoXKbModel","gotoXKbVariant",