Fixed local printer assignement. It had double mac address requestors.

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

diff --git a/plugins/admin/systems/class_printGeneric.inc b/plugins/admin/systems/class_printGeneric.inc
index 3c2e84c7178611e5962910596dbf2e4e26e71fef..301a9d21bdb0e24560d7a66b3e3355064583ffa5 100644 (file)
--- a/plugins/admin/systems/class_printGeneric.inc
+++ b/plugins/admin/systems/class_printGeneric.inc
@@ -508,7 +508,11 @@ class printgeneric extends plugin
     $smarty->assign("AdminMember"    ,$this->AdminMember);
     $smarty->assign("AdminMembers"   ,$adminlist);
     $smarty->assign("AdminMemberKeys",array_flip($adminlist));
-    $smarty->assign("netconfig", $this->netConfigDNS->execute());
+    if($this->BelongsTo == "Printer"){
+      $smarty->assign("netconfig", $this->netConfigDNS->execute());
+    } else {
+      $smarty->assign("netconfig", "");
+    }
 
     return($display.$smarty->fetch (get_template_path('printer.tpl', TRUE)));
   }
@@ -577,7 +581,9 @@ class printgeneric extends plugin
   {
     /* Call common method to give check the hook */
     $message= plugin::check();
-    $message= array_merge($message, $this->netConfigDNS->check());
+    if ($this->BelongsTo == 'printer'){
+      $message= array_merge($message, $this->netConfigDNS->check());
+    }
 
     /* Don't display check messages if this is a template object */
     if(isset($this->parent->by_object['workgeneric'])){

diff --git a/plugins/admin/systems/printer.tpl b/plugins/admin/systems/printer.tpl
index 876ae22baf1153f4c942217f9f641d47c43cc73a..49ed25737938119ecad36e3769801ca2e2ace6b6 100644 (file)
--- a/plugins/admin/systems/printer.tpl
+++ b/plugins/admin/systems/printer.tpl
@@ -99,9 +99,10 @@
        </tr>
 </table>
 
-
+{if $netconfig ne ''}
 <p class="plugbottom" style="margin-bottom:0px; padding:0px;">&nbsp;</p>
 {$netconfig}
+{/if}
 
 <!-- Place cursor -->
 <script language="JavaScript" type="text/javascript">