From bc8b624a046479463343a278651c3d3670939790 Mon Sep 17 00:00:00 2001 From: hickert Date: Wed, 25 Jan 2006 10:23:37 +0000 Subject: [PATCH] Last changes .... i hope so ... git-svn-id: https://oss.gonicus.de/repositories/gosa/trunk@2580 594d385d-05f5-0310-b6e9-bd551577e9d8 --- plugins/admin/systems/class_glpiAccount.inc | 2 +- plugins/admin/systems/class_glpiPrinterAccount.inc | 6 +++--- plugins/admin/systems/glpiPrinter.tpl | 6 +++--- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/plugins/admin/systems/class_glpiAccount.inc b/plugins/admin/systems/class_glpiAccount.inc index a72f7005c..6e5cb2ccd 100644 --- a/plugins/admin/systems/class_glpiAccount.inc +++ b/plugins/admin/systems/class_glpiAccount.inc @@ -129,7 +129,7 @@ class glpiAccount extends plugin $smarty->assign($attr,array()); $smarty->assign($attr."ACL"," disabled "); } - foreach(array("type","FK_glpi_enterprise","os","tech_num","comments","contact_num") as $attr){ + foreach(array("type","FK_glpi_enterprise","os","tech_num","comments","contact_num","AttachmentsDiv") as $attr){ $smarty->assign($attr,""); $smarty->assign($attr."ACL"," disabled "); } diff --git a/plugins/admin/systems/class_glpiPrinterAccount.inc b/plugins/admin/systems/class_glpiPrinterAccount.inc index 5ac4eb1b6..59da4baf4 100644 --- a/plugins/admin/systems/class_glpiPrinterAccount.inc +++ b/plugins/admin/systems/class_glpiPrinterAccount.inc @@ -138,11 +138,11 @@ class glpiPrinterAccount extends plugin /* Assign smarty defaults To avoid undefined indexes, if there is an error with the glpi db */ - foreach(array("PrinterTypeKeys","PrinterTypes","ManufacturerKeys","Manufacturers","Attachments","AttachmentKeys") as $attr){ + foreach(array("PrinterTypeKeys","PrinterTypes","ManufacturerKeys","Manufacturers","Attachments","AttachmentKeys","CartridgeKeys","Cartridges") as $attr){ $smarty->assign($attr,array()); $smarty->assign($attr."ACL"," disabled "); } - foreach(array("type","FK_glpi_enterprise","tech_num","contact_num","comments","flags_serial","flags_par","flags_usb") as $attr){ + foreach(array("type","FK_glpi_enterprise","tech_num","contact_num","comments","flags_serial","flags_par","flags_usb","AttachmentsDiv") as $attr){ $smarty->assign($attr,""); $smarty->assign($attr."ACL"," disabled "); } @@ -500,7 +500,7 @@ class glpiPrinterAccount extends plugin * Assign listbox / checkbox .... values to smarty */ /* Assign smarty defaults */ - foreach(array("PrinterTypes","PrinterTypeKeys","Manufacturers","TechnicalResponsibles","Attachments") as $attr){ + foreach(array("PrinterTypes","PrinterTypeKeys","Manufacturers","TechnicalResponsibles","Attachments","Cartridges") as $attr){ $smarty->assign($attr,array()); $smarty->assign($attr."ACL",chkacl($this->acl,$attr)); } diff --git a/plugins/admin/systems/glpiPrinter.tpl b/plugins/admin/systems/glpiPrinter.tpl index 5295f5392..f47f88b5c 100644 --- a/plugins/admin/systems/glpiPrinter.tpl +++ b/plugins/admin/systems/glpiPrinter.tpl @@ -90,7 +90,7 @@ {$AttachmentsDiv} - + @@ -118,8 +118,8 @@ - - + + -- 2.30.2