show you when mail is sent to an alias or email

owncloud-archive · Jul 27, 2016 · bdd5a5c · bdd5a5c
1 parent 8afc1a0
commit bdd5a5c
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/js/views/composer.js b/js/views/composer.js
@@ -515,7 +515,6 @@ define(function(require) {
 				alias =  _.find(this.aliases, function(alias) {	return alias.emailAddress  === toEmail;	});
 			}
 			if (alias) {
-				console.log(alias);
 				$('.mail-account').val(alias.id);
 			}
 		},

diff --git a/js/views/helper.js b/js/views/helper.js
@@ -58,7 +58,9 @@ define(function(require) {
 				.replace(/(^'|'$)/g, '');
 			label = Handlebars.Utils.escapeExpression(label);
 			var email = Handlebars.Utils.escapeExpression(value.email);
-			if (currentAccount && email === currentAccount.get('emailAddress')) {
+
+			if (currentAccount && (email === currentAccount.get('emailAddress') ||
+				_.find(currentAccount.get('aliases').toJSON(), function(alias) { return alias.alias  === email; }))) {
 				label = t('mail', 'you');
 			}
 			var title = t('mail', 'Send message to {email}', {email: email});