From fd8d7bb6ed92e83466a7063e7b9d469629c68e62 Mon Sep 17 00:00:00 2001 From: Francis Lachapelle Date: Thu, 3 Mar 2016 15:41:29 -0500 Subject: [PATCH] (js) Fix attachments display when forwarding a msg Fixes #3560 --- .../js/Mailer/MessageEditorController.js | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/UI/WebServerResources/js/Mailer/MessageEditorController.js b/UI/WebServerResources/js/Mailer/MessageEditorController.js index e2defdd38..a0167b9f5 100644 --- a/UI/WebServerResources/js/Mailer/MessageEditorController.js +++ b/UI/WebServerResources/js/Mailer/MessageEditorController.js @@ -112,19 +112,19 @@ function addAttachments() { // Add existing attached files to uploader - var i, data, fileItem; - if (vm.message.attachmentAttrs) - for (i = 0; i < vm.message.attachmentAttrs.length; i++) { + var i, data, fileItem, attrs = vm.message.editable.attachmentAttrs; + if (attrs) + for (i = 0; i < attrs.length; i++) { data = { - name: vm.message.attachmentAttrs[i].filename, - type: vm.message.attachmentAttrs[i].mimetype, - size: parseInt(vm.message.attachmentAttrs[i].size) + name: attrs[i].filename, + type: attrs[i].mimetype, + size: parseInt(attrs[i].size) }; fileItem = new FileUploader.FileItem(vm.uploader, data); fileItem.progress = 100; fileItem.isUploaded = true; fileItem.isSuccess = true; - fileItem.inlineUrl = vm.message.attachmentAttrs[i].url; + fileItem.inlineUrl = attrs[i].url; vm.uploader.queue.push(fileItem); } }