From 270ff1bd29f120701395cbfb4a027b2071795dc6 Mon Sep 17 00:00:00 2001 From: Francis Lachapelle Date: Tue, 7 Mar 2017 10:26:10 -0500 Subject: [PATCH] (js) Fix saving draft outside Mail module Fixes #4071 --- NEWS | 1 + UI/WebServerResources/js/Mailer/Message.service.js | 3 +++ UI/WebServerResources/js/Mailer/MessageEditorController.js | 2 +- 3 files changed, 5 insertions(+), 1 deletion(-) diff --git a/NEWS b/NEWS index 8b986da15..2589a41c8 100644 --- a/NEWS +++ b/NEWS @@ -20,6 +20,7 @@ Bug fixes - [web] exposed default value of SOGoMailAutoSave (#4053) - [web] fixed handling of contact organizations (#4028) - [web] fixed handling of attachments in mail editor (#4058, #4063) + - [web] fixed saving draft outside Mail module (#4071) 3.2.7 (2017-02-14) ------------------ diff --git a/UI/WebServerResources/js/Mailer/Message.service.js b/UI/WebServerResources/js/Mailer/Message.service.js index 2d6f101b8..99e7ce06c 100644 --- a/UI/WebServerResources/js/Mailer/Message.service.js +++ b/UI/WebServerResources/js/Mailer/Message.service.js @@ -129,6 +129,9 @@ if (options && options.asDraft && this.draftId) { id = buildPath() + '/' + this.draftId; // add draft ID } + if (options && options.withResourcePath) { + id = Message.$$resource.path(id); // return absolute URL + } return id; }; diff --git a/UI/WebServerResources/js/Mailer/MessageEditorController.js b/UI/WebServerResources/js/Mailer/MessageEditorController.js index 3abe38d0f..b5e7190e0 100644 --- a/UI/WebServerResources/js/Mailer/MessageEditorController.js +++ b/UI/WebServerResources/js/Mailer/MessageEditorController.js @@ -33,7 +33,7 @@ vm.sendState = false; vm.toggleFullscreen = toggleFullscreen; vm.uploader = new FileUploader({ - url: stateMessage.$absolutePath({asDraft: true}) + '/save', + url: stateMessage.$absolutePath({asDraft: true, withResourcePath: true}) + '/save', autoUpload: true, alias: 'attachments', removeAfterUpload: false,