From c4ddc07f50f8bfaa6cd3390f88187ad2558ad85d Mon Sep 17 00:00:00 2001 From: hickert Date: Wed, 24 Nov 2010 08:24:02 +0000 Subject: [PATCH] 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 --- gosa-plugins/systems/admin/systems/class_termDNS.inc | 1 + gosa-plugins/systems/admin/systems/network.tpl | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/gosa-plugins/systems/admin/systems/class_termDNS.inc b/gosa-plugins/systems/admin/systems/class_termDNS.inc index 022d92d25..e3059b225 100644 --- 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 16bde90f1..ce994887b 100644 --- a/gosa-plugins/systems/admin/systems/network.tpl +++ b/gosa-plugins/systems/admin/systems/network.tpl @@ -35,7 +35,7 @@ - {$staticAddress} + {if $MACisMust}{$staticAddress}{/if} {render acl=$macAddressACL} -- 2.30.2