Last changes .... i hope so ...

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

diff --git a/plugins/admin/systems/class_glpiAccount.inc b/plugins/admin/systems/class_glpiAccount.inc
index a72f7005c957413499578d32658c73b95107ef7f..6e5cb2ccd5773a766c62bb1d7676dc0c17b60d77 100644 (file)
--- 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 5ac4eb1b656b38cb8ecce50e461e4c761ccf02ad..59da4baf45669e3bba068a8ff830f3f5ebe79627 100644 (file)
--- 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 5295f5392d3966c98b0dc62c71f8b7be4b463c02..f47f88b5c1aa2328d8e02657d690d9fd8d01ebe5 100644 (file)
--- a/plugins/admin/systems/glpiPrinter.tpl
+++ b/plugins/admin/systems/glpiPrinter.tpl
@@ -90,7 +90,7 @@
                                <tr>
                                        <td>
                                                {$AttachmentsDiv}
-                                               <input name="AddAttachment"     value="{t}Add{/t}" type="submit">       
+                                               <input name="AddAttachment"     value="{t}Add{/t}" type="submit" {$AttachmentsACL}>     
                                        </td>
                                </tr>
                        </table>
@@ -118,8 +118,8 @@
                                                <select name="Cartridges[]" {$CartridgesACL} style="height:100px;width:100%;" multiple>
                                                        {html_options values=$CartridgeKeys output=$Cartridges}
                                                </select>
-                                               <input name="AddCartridge"      value="{t}Add{/t}" type="submit">       
-                                               <input name="RemoveCartridge"   value="{t}Remove{/t}" type="submit">    
+                                               <input name="AddCartridge"      value="{t}Add{/t}" type="submit" {$CartridgesACL}>      
+                                               <input name="RemoveCartridge"   value="{t}Remove{/t}" type="submit" {$CartridgesACL}>   
                                        </td>
                                </tr>
                        </table>