From 1d4dfa18b421581257f8ebf2726a5fb87200cc1f Mon Sep 17 00:00:00 2001
From: hickert <hickert@594d385d-05f5-0310-b6e9-bd551577e9d8>
Date: Wed, 24 Nov 2010 08:43:57 +0000
Subject: [PATCH] Updated must dectection for macAddress

git-svn-id: https://oss.gonicus.de/repositories/gosa/branches/2.6@20347 594d385d-05f5-0310-b6e9-bd551577e9d8
---
 gosa-plugins/systems/admin/systems/class_termDNS.inc | 3 ---
 gosa-plugins/systems/admin/systems/network.tpl       | 4 ++--
 2 files changed, 2 insertions(+), 5 deletions(-)

diff --git a/gosa-plugins/systems/admin/systems/class_termDNS.inc b/gosa-plugins/systems/admin/systems/class_termDNS.inc
index e3059b225..7582e3c4c 100644
--- a/gosa-plugins/systems/admin/systems/class_termDNS.inc
+++ b/gosa-plugins/systems/admin/systems/class_termDNS.inc
@@ -294,7 +294,6 @@ class termDNS extends plugin
     }
  
     $smarty->assign("additionalHostNumbers",$this->additionalHostNumbers);
-    $smarty->assign("staticAddress", ""); 
  
     /**********
      * Autonet completion
@@ -381,7 +380,6 @@ class termDNS extends plugin
       foreach($this->attributes as $attr){
         $smarty->assign($attr,$this->$attr);
       }
-      $smarty->assign("staticAddress","<font class=\"must\">*</font>");
 
       $display.= $smarty->fetch(get_template_path('network.tpl', TRUE));
     }else{
@@ -461,7 +459,6 @@ class termDNS extends plugin
 
       $smarty->assign("records",$tmp['str']);
       $smarty->assign("changeStateForRecords",$changeStateForRecords);
-      $smarty->assign("staticAddress","<font class=\"must\">*</font>");
 
       $smarty->assign("autonetACL",$this->acl_is_writeable("macAddress") && $this->acl_is_writeable("ipHostNumber")?"rw":"");
 
diff --git a/gosa-plugins/systems/admin/systems/network.tpl b/gosa-plugins/systems/admin/systems/network.tpl
index ce994887b..8f622e3ac 100644
--- a/gosa-plugins/systems/admin/systems/network.tpl
+++ b/gosa-plugins/systems/admin/systems/network.tpl
@@ -6,7 +6,7 @@
 		<td	style="width:50%; vertical-align: top;">
 			<table	summary="">
 				<tr>
-					<td style='vertical-align:top;'><LABEL	for="ipHostNumber">{t}IP-address{/t}{if $IPisMust}{$staticAddress}{/if}</LABEL></td>
+					<td style='vertical-align:top;'><LABEL	for="ipHostNumber">{t}IP-address{/t}{if $IPisMust}{$must}{/if}</LABEL></td>
 					<td>
 {render acl=$ipHostNumberACL}
             <input	type='text' id="ipHostNumber"	name="ipHostNumber"	size=25	maxlength=80	value="{$ipHostNumber}">
@@ -35,7 +35,7 @@
           </td>
 				</tr>
 				<tr>
-					<td><LABEL	for="macAddress">{t}MAC-address{/t}</LABEL>{if $MACisMust}{$staticAddress}{/if}</td>
+					<td><LABEL	for="macAddress">{t}MAC-address{/t}</LABEL>{if $MACisMust}{$must}{/if}</td>
 					<td>
 {render acl=$macAddressACL}
             <input	type='text' name="macAddress"	id="macAddress"	size=25	maxlength=80	value="{$macAddress}">
-- 
2.30.2