Compose from email address not sorted by primary (#351)

2017-01-04 10:53:10 +00:00
parent b25ff943e4
commit bc64e7ffe4
1 changed files with 4 additions and 0 deletions
@@ -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)) {