Updated must dectection for macAddress

git-svn-id: https://oss.gonicus.de/repositories/gosa/branches/2.6@20347 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 e3059b2250b463dd2acc710d191000331ea4e16d..7582e3c4c1c6b74cc9483382cf0d36b1d3f431db 100644 (file)
--- 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 ce994887b4e2127ed9672bc164c86fe16eb3fdce..8f622e3acd999795b5484ef5ae79fc34a386f609 100644 (file)
--- 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}">