From: hickert <hickert@594d385d-05f5-0310-b6e9-bd551577e9d8>
Date: Thu, 12 Jul 2007 09:16:47 +0000 (+0000)
Subject: Updated Inherit everthing for terminals
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=458e1d6feba6965ea984d1a3b4b9f250b65468e3;p=gosa.git

Updated Inherit everthing for terminals


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

diff --git a/plugins/admin/systems/class_terminalGeneric.inc b/plugins/admin/systems/class_terminalGeneric.inc
index 5a9f52357..598e4fbd4 100644
--- a/plugins/admin/systems/class_terminalGeneric.inc
+++ b/plugins/admin/systems/class_terminalGeneric.inc
@@ -357,10 +357,6 @@ class termgeneric extends plugin
     plugin::save_object();
     $this->netConfigDNS->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'];
@@ -379,6 +375,11 @@ class termgeneric extends plugin
         $this->inheritTimeServer = false;
       }
     }  
+
+    if(isset($_POST["inheritAll"])){
+      $this->set_everything_to_inherited();
+    }
+
   }
 
 
@@ -524,6 +525,11 @@ class termgeneric extends plugin
 
   function set_everything_to_inherited()
   {
+    $this->gotoTerminalPath  = "default";
+    $this->gotoSwapServer    = "default" ;
+    $this->gotoSyslogServer  = "default";
+    $this->inheritTimeServer = TRUE;
+
     /* Set workstation service attributes to inherited */
     if($this->member_of_ogroup && isset($this->parent->by_object['termservice'])){
       foreach(array("gotoXKbLayout","gotoXKbModel","gotoXKbVariant",
diff --git a/plugins/admin/systems/terminal.tpl b/plugins/admin/systems/terminal.tpl
index 60b4cb32c..0444840f3 100644
--- a/plugins/admin/systems/terminal.tpl
+++ b/plugins/admin/systems/terminal.tpl
@@ -29,7 +29,6 @@
 {if $member_of_ogroup}
    <tr>
 	   <td>
-		   {t}Inheritance{/t}
 	   </td>
 	   <td>
    			<input type='submit' name='inheritAll' value='{t}Inherit all{/t}'>
diff --git a/plugins/admin/systems/workstation.tpl b/plugins/admin/systems/workstation.tpl
index 0a8f0fd06..bbed6b5c7 100644
--- a/plugins/admin/systems/workstation.tpl
+++ b/plugins/admin/systems/workstation.tpl
@@ -34,7 +34,6 @@
 {if $member_of_ogroup}
 	<tr>
 		<td>
-			{t}Inheritance{/t}
 		</td>
 		<td>
 	<input type='submit' name='inheritAll' value='{t}Inherit all{/t}'>