From bc64e7ffe4a4b49c4ea4b3516d2fa4674d696f9e Mon Sep 17 00:00:00 2001 From: Alasdair Campbell Date: Wed, 4 Jan 2017 10:53:10 +0000 Subject: [PATCH] Compose from email address not sorted by primary (#351) --- client/src/views/email/fields/compose-from-address.js | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/client/src/views/email/fields/compose-from-address.js b/client/src/views/email/fields/compose-from-address.js index 5e37e4207f..5969a81d19 100644 --- a/client/src/views/email/fields/compose-from-address.js +++ b/client/src/views/email/fields/compose-from-address.js @@ -46,11 +46,15 @@ Espo.define('views/email/fields/compose-from-address', 'views/fields/base', func this.list.push(this.getUser().get('emailAddress')); }*/ + this.list.push(this.getUser().get('emailAddress')); + var emailAddressList = this.getUser().get('emailAddressList') || []; emailAddressList.forEach(function (item) { this.list.push(item); }, this); + this.list = _.uniq(this.list); + if (this.getConfig().get('outboundEmailIsShared') && this.getConfig().get('outboundEmailFromAddress')) { var address = this.getConfig().get('outboundEmailFromAddress'); if (!~this.list.indexOf(address)) {