You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@whimsical.apache.org by se...@apache.org on 2019/02/18 17:07:36 UTC
[whimsy] branch master updated: Show which emails are used for
forwarding
This is an automated email from the ASF dual-hosted git repository.
sebb pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/whimsy.git
The following commit(s) were added to refs/heads/master by this push:
new 00ad45a Show which emails are used for forwarding
00ad45a is described below
commit 00ad45a45983c2c531689899c523a6f037624862
Author: Sebb <se...@apache.org>
AuthorDate: Mon Feb 18 17:07:28 2019 +0000
Show which emails are used for forwarding
---
www/roster/models/committer.rb | 1 +
www/roster/views/person/email.js.rb | 16 ++++++++++++++--
2 files changed, 15 insertions(+), 2 deletions(-)
diff --git a/www/roster/models/committer.rb b/www/roster/models/committer.rb
index 34f2733..51aca82 100644
--- a/www/roster/models/committer.rb
+++ b/www/roster/models/committer.rb
@@ -45,6 +45,7 @@ class Committer
response[:name] = name
response[:mail] = person.all_mail
+ response[:mail_default] = person.mail # used for forwarding mails
unless person.pgp_key_fingerprints.empty?
response[:pgp] = person.pgp_key_fingerprints
diff --git a/www/roster/views/person/email.js.rb b/www/roster/views/person/email.js.rb
index ee3fd55..e40e038 100644
--- a/www/roster/views/person/email.js.rb
+++ b/www/roster/views/person/email.js.rb
@@ -7,12 +7,24 @@ class PersonEmail < Vue
committer = @@person.state.committer
_div.row do
- _div.name 'Email addresses'
+ _div.name do
+ _ 'Email addresses '
+ _b do
+ _ '(forwards)'
+ end
+
+ end
_div.value do
_ul committer.mail do |url|
_li do
- _a url, href: 'mailto:' + url
+ if committer.mail_default.include?(url)
+ _b do
+ _a url, href: 'mailto:' + url
+ end
+ else
+ _a url, href: 'mailto:' + url
+ end
end
end
end