Only display {$must} for macAddress if it is really required.

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

diff --git a/gosa-plugins/systems/admin/systems/class_termDNS.inc b/gosa-plugins/systems/admin/systems/class_termDNS.inc
index 022d92d2516ff8f817e9b018430418a84f1aea51..e3059b2250b463dd2acc710d191000331ea4e16d 100644 (file)
--- a/gosa-plugins/systems/admin/systems/class_termDNS.inc
+++ b/gosa-plugins/systems/admin/systems/class_termDNS.inc
@@ -260,6 +260,7 @@ class termDNS extends plugin
          /* Call parent execute */
     $smarty= get_smarty();
     $smarty->assign("autonetACL",$this->acl_is_writeable("macAddress") && $this->acl_is_writeable("ipHostNumber")?"rw":"");
+    $smarty->assign("MACisMust",$this->MACisMust);
 
     $tmp = $this->plInfo();
     foreach($tmp['plProvidedAcls'] as $name => $translation){

diff --git a/gosa-plugins/systems/admin/systems/network.tpl b/gosa-plugins/systems/admin/systems/network.tpl
index 16bde90f17dec00abaffe659e959ed235a77bfe2..ce994887b4e2127ed9672bc164c86fe16eb3fdce 100644 (file)
--- a/gosa-plugins/systems/admin/systems/network.tpl
+++ b/gosa-plugins/systems/admin/systems/network.tpl
@@ -35,7 +35,7 @@
           </td>
                                </tr>
                                <tr>
-                                       <td><LABEL      for="macAddress">{t}MAC-address{/t}</LABEL>{$staticAddress}</td>
+                                       <td><LABEL      for="macAddress">{t}MAC-address{/t}</LABEL>{if $MACisMust}{$staticAddress}{/if}</td>
                                        <td>
 {render acl=$macAddressACL}
             <input     type='text' name="macAddress"   id="macAddress" size=25 maxlength=80    value="{$macAddress}">