amorfo77/sogo
1
0
Fork 0
mirror of https://github.com/inverse-inc/sogo.git synced 2026-09-29 09:00:31 +00:00
Code Issues Projects Releases Wiki Activity

Fix handling of recipient addresses in mail editor

Browse Source
This commit is contained in:
Francis Lachapelle
2014-12-11 21:52:46 -05:00
parent 761ca0f983
commit c2c15e4968
4 changed files with 58 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
UI/WebServerResources/js/Mailer/message-model.js
+53 -5
View File
@@ -73,7 +73,7 @@
/**
* @function $formatFullAddresses
* @memberof Message.prototype
* @desc Preformat all sender and recipients addresses with a complete description (name <email>).
* @desc Format all sender and recipients addresses with a complete description (name <email>).
*/
Message.prototype.$formatFullAddresses = function() {
var _this = this;
@@ -114,10 +114,31 @@
return Message.$sce.trustAs('html', this.content);
};
/**
* @function $editableContent
* @memberof Message.prototype
* @desc Fetch the editable message body along with other metadat such as the recipients.
* @returns the HTML representation of the body
*/
Message.prototype.$editableContent = function() {
var _this = this,
deferred = Message.$q.defer();
Message.$$resource.fetch(this.$absolutePath({asDraft: true}), 'edit').then(function(data) {
Message.$log.debug('editable = ' + JSON.stringify(data, undefined, 2));
_this.editable = data;
deferred.resolve(data.text);
}, function(data) {
deferred.reject();
});
return deferred.promise;
};
/**
* @function $update
* @memberof Message.prototype
* @desc Fetch the message body along with other metadata such as the list of attachments.
* @desc Fetch the viewable message body along with other metadata such as the list of attachments.
* @returns a promise of the HTTP operation
*/
Message.prototype.$update = function() {
@@ -128,17 +149,44 @@
return this.$unwrap(futureMessageData);
};
/**
* @function $save
* @memberof Message.prototype
* @desc Save the message to the server.
* @returns a promise of the HTTP operation
*/
Message.prototype.$save = function() {
var data = this.$omit();
Message.$log.debug(JSON.stringify(data, undefined, 2));
var data = this.editable;
// Flatten recipient addresses
_.each(['to', 'cc', 'bcc', 'reply-to'], function(type) {
if (data[type]) {
data[type] = _.pluck(data[type], 'text');
}
});
Message.$log.debug('save = ' + JSON.stringify(data, undefined, 2));
return Message.$$resource.save(this.$absolutePath({asDraft: true}), data);
};
/**
* @function $send
* @memberof Message.prototype
* @desc Send the message.
* @returns a promise of the HTTP operation
*/
Message.prototype.$send = function() {
var data = this.$omit(),
var data = angular.copy(this.editable),
deferred = Message.$q.defer();
// Flatten recipient addresses
_.each(['to', 'cc', 'bcc', 'reply-to'], function(type) {
if (data[type]) {
data[type] = _.pluck(data[type], 'text');
}
});
Message.$log.debug('send = ' + JSON.stringify(data, undefined, 2));
Message.$$resource.post(this.$absolutePath({asDraft: true}), 'send', data).then(function(data) {
if (data.status == 'success') {
deferred.resolve(data);