From: hickert <hickert@594d385d-05f5-0310-b6e9-bd551577e9d8>
Date: Mon, 19 Nov 2007 14:24:55 +0000 (+0000)
Subject: Do not display inherit options when in ogroup context
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=92a5476ba3e38d4d03765a78bc654361e821fa02;p=gosa.git

Do not display inherit options when in ogroup context


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

diff --git a/plugins/admin/systems/class_workstationStartup.inc b/plugins/admin/systems/class_workstationStartup.inc
index 4105b26bc..e9c5144fd 100644
--- a/plugins/admin/systems/class_workstationStartup.inc
+++ b/plugins/admin/systems/class_workstationStartup.inc
@@ -103,7 +103,7 @@ class workstartup extends plugin
         $this->gotoLdapServers[] = preg_replace("/^[0-9]*:/","",$value);
       }
     }
-    if(!count($this->gotoLdapServers)){ 
+    if(!count($this->gotoLdapServers) && $this->member_of_ogroup){ 
       $this->gotoLdap_inherit = TRUE;
     }
 
@@ -325,7 +325,9 @@ class workstartup extends plugin
     $this->orig_dn= $this->dn;
 
     /* Handle inheritance value "default" */
-    $this->gotoBootKernels= array("default-inherited" => '['._("inherited").']');
+    if ($this->member_of_ogroup){
+      $this->gotoBootKernels= array("default-inherited" => '['._("inherited").']'); 
+    }
 
     /* Load hardware list */
     if ($this->member_of_ogroup){
@@ -677,6 +679,8 @@ class workstartup extends plugin
       $smarty->assign($name."ACL",$this->getacl($name));
     } 
 
+    $smarty->assign("member_of_ogroup",$this->member_of_ogroup);
+
     /* In this section server shares will be defined
      * A user can select one of the given shares and a mount point
      *  and attach this combination to his setup.
diff --git a/plugins/admin/systems/workstationStartup.tpl b/plugins/admin/systems/workstationStartup.tpl
index f68115942..d69b2ec72 100644
--- a/plugins/admin/systems/workstationStartup.tpl
+++ b/plugins/admin/systems/workstationStartup.tpl
@@ -26,12 +26,14 @@
     <tr>
      <td colspan="2" style='vertical-align:top;padding-top:3px;'><LABEL for="gotoLdapServer">{t}LDAP server{/t}</LABEL>
 {render acl=$gotoLdapServerACL}
+{if $member_of_ogroup}
 (<input type='checkbox' name='gotoLdap_inherit' {if $gotoLdap_inherit} checked {/if} value="1"
 	onClick="document.mainform.submit();" class='center'>
 &nbsp;{t}inherit from group{/t})
 {if !$JS}
 	<input type='image' src="images/list_reload.png" alt='{t}Reload{/t}' class='center'>
 {/if}
+{/if}
 {/render}
 {render acl=$gotoLdapServerACL_inherit}
 	  {$gotoLdapServers}