whimsical-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From s...@apache.org
Subject [whimsy] branch master updated: Move secretary to bcc if possible
Date Mon, 04 Jun 2018 16:24:10 GMT
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 b173311  Move secretary to bcc if possible
b173311 is described below

commit b1733114a5b3816d4da2f4388fb498171f004fed
Author: Sebb <sebb@apache.org>
AuthorDate: Mon Jun 4 17:24:07 2018 +0100

    Move secretary to bcc if possible
---
 www/secretary/workbench/views/actions/icla.json.rb | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/www/secretary/workbench/views/actions/icla.json.rb b/www/secretary/workbench/views/actions/icla.json.rb
index 170e854..2806401 100644
--- a/www/secretary/workbench/views/actions/icla.json.rb
+++ b/www/secretary/workbench/views/actions/icla.json.rb
@@ -123,17 +123,21 @@ task "email #@email" do
   end
 
   # choose reply message based on whether or not the project/userid info was provided
+  use_Bcc = false # should we use Bcc for the secretary?
   if @user and not @user.empty?
     if @valid_user
       # pmc vote verified and id is valid
       reply = 'icla-account-requested.erb'
+      use_Bcc = true # it's now up to the (P)PMC
     else
       # pmc vote verified but id is invalid
       reply = 'icla-invalid-id.erb'
+      use_Bcc = true # it's now up to the (P)PMC
     end
   elsif @pmc
     # no pmc vote but pmc was requested to be notified or user is active on project
     reply = 'icla-pmc-notified.erb'
+    use_Bcc = true # it's now up to the (P)PMC
   else
     # no evidence of project activity by the submitter
     reply = 'icla.erb'
@@ -145,10 +149,11 @@ task "email #@email" do
     from: @from,
     to: "#{@pubname.inspect} <#{@email}>",
     cc: [
-      'secretary@apache.org',
+      ('secretary@apache.org' unless use_Bcc),
       ("private@#{@pmc.mail_list}.apache.org" if @pmc), # copy pmc
       (@podling.private_mail_list if @podling) # copy podling
     ],
+    bcc: [ ('secretary@apache.org' if use_Bcc)],
     body: template(reply)
   )
 

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

Mime
View raw message