From: hickert Date: Fri, 20 Jan 2006 11:17:14 +0000 (+0000) Subject: Some changes X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=31a39c8fd51fc7c8b3c1fe0c52cd2fa0fe4d83d6;p=gosa.git Some changes git-svn-id: https://oss.gonicus.de/repositories/gosa/trunk@2536 594d385d-05f5-0310-b6e9-bd551577e9d8 --- diff --git a/plugins/admin/systems/class_glpiAccount.inc b/plugins/admin/systems/class_glpiAccount.inc index 43af3cd09..1f3cb999c 100644 --- a/plugins/admin/systems/class_glpiAccount.inc +++ b/plugins/admin/systems/class_glpiAccount.inc @@ -11,7 +11,7 @@ class glpiAccount extends plugin var $ignore_account= FALSE; var $attributes= array("ID","name","contact", "tech_num","comments","date_mod","os","location","domain","network","contact_num", - "model","type","is_template","FK_glpi_enterprise","deleted","InstalledDevices","Attachments"); + "model","type","is_template","FK_glpi_enterprise","deleted"); var $ID ; // Is set if this entry is edited var $name = ""; // This should be the dn of this entry @@ -225,8 +225,10 @@ class glpiAccount extends plugin /* Remove Attachment fro this tab */ if((isset($_POST['RemoveAttachment']))&&(isset($_POST['Attachments']))){ - if(isset($this->usedAttachments[$_POST['Attachments']])){ - unset($this->usedAttachments[$_POST['Attachments']]); + foreach($_POST['Attachments'] as $entry){ + if(isset($this->usedAttachments[$entry])){ + unset($this->usedAttachments[$entry]); + } } } @@ -436,7 +438,7 @@ class glpiAccount extends plugin /* Assign some vars to smarty */ - foreach(array("type","FK_glpi_enterprise","os","tech_num","contact_num") as $attr){ + foreach(array("type","FK_glpi_enterprise","os","tech_num","contact_num","Attachments","InstalledDevices") as $attr){ $smarty->assign($attr,""); $smarty->assign($attr."ACL",chkacl($this->acl,$attr)); } diff --git a/plugins/admin/systems/glpi.tpl b/plugins/admin/systems/glpi.tpl index 7e13cfd8a..1cf9da4ee 100644 --- a/plugins/admin/systems/glpi.tpl +++ b/plugins/admin/systems/glpi.tpl @@ -88,7 +88,7 @@
- {html_options values=$AttachmentKeys output=$Attachments} diff --git a/plugins/admin/systems/glpiAttachmentPool.tpl b/plugins/admin/systems/glpiAttachmentPool.tpl index 91369ad2a..d19f4f815 100644 --- a/plugins/admin/systems/glpiAttachmentPool.tpl +++ b/plugins/admin/systems/glpiAttachmentPool.tpl @@ -50,7 +50,7 @@

 

- - + +

diff --git a/plugins/admin/systems/glpiDeviceManagement.tpl b/plugins/admin/systems/glpiDeviceManagement.tpl index e25018a6c..fbaee892e 100644 --- a/plugins/admin/systems/glpiDeviceManagement.tpl +++ b/plugins/admin/systems/glpiDeviceManagement.tpl @@ -49,6 +49,8 @@

 

- - +

+ + +