Merge branch 'master' of https://github.com/espocrm/espocrm

2014-11-05 13:32:48 +02:00
parent 4d6bb307ba 059fdcfd14
commit 1cdef2245a
1 changed files with 8 additions and 1 deletions
@@ -78,8 +78,15 @@ Espo.define('Views.Email.Detail', 'Views.Detail', function (Dep) {
                attributes['to'] = this.model.get('from');
            }
            
-            if (cc && this.model.get('cc')) {
+            if (cc) {
                attributes['cc'] = this.model.get('cc');
+                (this.model.get('to')).split(',').forEach(function (item) {
+                   item = item.trim();
+                   if (item != this.getUser().get('emailAddress')) {
+                       attributes['cc'] += ', ' + item;
+                   }
+                }, this);
+                attributes['cc'] = attributes['cc'].replace(/^(\, )/,"");
            }
            
            if (this.model.get('parentId')) {