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

Change key for envelope addresses metadata

Browse Source
This commit is contained in:
Francis Lachapelle
2014-12-11 09:15:33 -05:00
parent a02026b71b
commit fdf875fb73
2 changed files with 30 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
UI/MailerUI/UIxEnvelopeAddressFormatter.m
View File

@@ -89,7 +89,7 @@ static Class StrClass = Nil;
meta = [NSMutableDictionary dictionary];
s = [_address baseEMail];
if (s) [meta setObject: s forKey: @"address"];
if (s) [meta setObject: s forKey: @"email"];
s = [_address personalName];
if (s) [meta setObject: s forKey: @"name"];

41
UI/WebServerResources/js/Mailer/message-model.js
View File

@@ -18,6 +18,7 @@
//console.debug(JSON.stringify(futureMessageData, undefined, 2));
angular.extend(this, futureMessageData);
this.id = this.$absolutePath();
this.$formatFullAddresses();
}
else {
// The promise will be unwrapped first
@@ -52,18 +53,42 @@
* @desc Build the path of the message
* @returns a string representing the path relative to the mail module
*/
Message.prototype.$absolutePath = function() {
Message.prototype.$absolutePath = function(options) {
var path;
path = _.map(this.mailboxPath.split('/'), function(component) {
return 'folder' + component.asCSSIdentifier();
});
path.splice(0, 0, this.accountId); // insert account ID
path.push(this.uid); // add message UID
if (options && options.asDraft && this.draftId) {
path.push(this.draftId); // add draft ID
}
else {
path.push(this.uid); // add message UID
}
return path.join('/');
};
/**
* @function $formatFullAddresses
* @memberof Message.prototype
* @desc Preformat all sender and recipients addresses with a complete description (name <email>).
*/
Message.prototype.$formatFullAddresses = function() {
var _this = this;
// Build long representation of email addresses
_.each(['from', 'to', 'cc', 'bcc', 'reply-to'], function(type) {
_.each(_this[type], function(data, i) {
if (data.name && data.name != data.email)
data.full = data.name + ' <' + data.email + '>';
else
data.full = '<' + data.email + '>';
});
});
};
/**
* @function $shortAddress
* @memberof Message.prototype
@@ -116,16 +141,8 @@
Message.$timeout(function() {
angular.extend(_this, data);
_this.id = _this.$absolutePath();
// Build long representation of email addresses
_.each(['from', 'to', 'cc', 'bcc', 'reply-to'], function(type) {
_.each(_this[type], function(data, i) {
if (data.name && data.name != data.address)
data.full = data.name + ' <' + data.address + '>';
else
data.full = '<' + data.address + '>';
});
});
deferred.resolve(_this.content);
_this.$formatFullAddresses();
deferred.resolve(_this);
});
}, function(data) {
angular.extend(_this, data);