You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@whimsical.apache.org by ru...@apache.org on 2018/05/13 00:14:29 UTC

[whimsy] branch master updated (29fe09c -> 48f5573)

This is an automated email from the ASF dual-hosted git repository.

rubys pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/whimsy.git.


    from 29fe09c  fix cc
     new 1e10201  fix username in sent email
     new 48f5573  tweak to and cc for complete reports

The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.


Summary of changes:
 www/board/agenda/views/buttons/email.js.rb | 15 +++++++++++----
 1 file changed, 11 insertions(+), 4 deletions(-)

-- 
To stop receiving notification emails like this one, please contact
rubys@apache.org.

[whimsy] 01/02: fix username in sent email

Posted by ru...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

rubys pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/whimsy.git

commit 1e10201a443ac69102b45597288d64eb3dd12ef3
Author: Sam Ruby <ru...@intertwingly.net>
AuthorDate: Sat May 12 20:13:48 2018 -0400

    fix username in sent email
---
 www/board/agenda/views/buttons/email.js.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/www/board/agenda/views/buttons/email.js.rb b/www/board/agenda/views/buttons/email.js.rb
index 40b9d3f..f41976d 100644
--- a/www/board/agenda/views/buttons/email.js.rb
+++ b/www/board/agenda/views/buttons/email.js.rb
@@ -42,7 +42,7 @@ class Email < Vue
 
         Thanks,
 
-        #{Pending.username}
+        #{Server.username}
 
         (on behalf of the ASF Board)
       }

-- 
To stop receiving notification emails like this one, please contact
rubys@apache.org.

[whimsy] 02/02: tweak to and cc for complete reports

Posted by ru...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

rubys pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/whimsy.git

commit 48f55738c1f4c8be8e5c18bb866a7885598e3616
Author: Sam Ruby <ru...@intertwingly.net>
AuthorDate: Sat May 12 20:14:00 2018 -0400

    tweak to and cc for complete reports
---
 www/board/agenda/views/buttons/email.js.rb | 13 ++++++++++---
 1 file changed, 10 insertions(+), 3 deletions(-)

diff --git a/www/board/agenda/views/buttons/email.js.rb b/www/board/agenda/views/buttons/email.js.rb
index f41976d..d13f032 100644
--- a/www/board/agenda/views/buttons/email.js.rb
+++ b/www/board/agenda/views/buttons/email.js.rb
@@ -26,7 +26,8 @@ class Email < Vue
     mail_list = @@item.mail_list
     mail_list = "private@#{mail_list}.apache.org" unless mail_list.include? '@'
 
-    destination = "mailto:#{@@item.chair_email}?cc=#{mail_list},#{@@item.cc}"
+    to = @@item.chair_email
+    cc = "#{mail_list},#{@@item.cc}"
 
     if @@item.missing
       subject = "Missing #{@@item.title} Board Report"
@@ -52,10 +53,16 @@ class Email < Vue
       body = body.strip().gsub(/#{indent}/, "\n").gsub(/(\S)\n(\S)/, "$1 $2")
     else
       subject = "#{@@item.title} Board Report"
-      body = @@item.comments.join("\n\n") || @@item.text
+      body = @@item.comments.join("\n\n")
+
+      if not body and @@item.text
+        to = mail_list
+        cc = @@item.cc
+        body = @@item.text
+      end
     end
 
-    window.location = destination +
+    window.location = "mailto:#{to}?cc=#{cc}" +
       "&subject=#{encodeURIComponent(subject)}" +
       "&body=#{encodeURIComponent(body)}"
   end

-- 
To stop receiving notification emails like this one, please contact
rubys@apache.org.