[whimsy] branch master updated: copy PMC/podling private lists

[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://git-dual.apache.org/repos/asf/whimsy.git

The following commit(s) were added to refs/heads/master by this push:
       new  8c8d1ea   copy PMC/podling private lists
8c8d1ea is described below

commit 8c8d1ea5ef74a4ff10804f82233c079d87caafcb
Author: Sam Ruby <ru...@intertwingly.net>
AuthorDate: Tue Sep 13 14:28:52 2016 -0400

    copy PMC/podling private lists
---
 lib/whimsy/asf/podlings.rb             | 9 +++++++++
 www/secmail/views/actions/icla.json.rb | 9 ++++++---
 www/secmail/views/forms/icla.js.rb     | 6 ++++--
 3 files changed, 19 insertions(+), 5 deletions(-)

diff --git a/lib/whimsy/asf/podlings.rb b/lib/whimsy/asf/podlings.rb
index f174d9f..2789b06 100644
--- a/lib/whimsy/asf/podlings.rb
+++ b/lib/whimsy/asf/podlings.rb
@@ -158,6 +158,15 @@ module ASF
       end
     end
 
+    # private mailing list associated with a given podling
+    def private_mail_list
+      if name == 'log4cxx2'
+        'private@logging.apache.org'
+      else
+        dev_mail_list.sub('dev', 'private')
+      end
+    end
+
     # Is this a podling mailing list?
     def mail_list?(list)
       return true if _match_mailname?(list, name())
diff --git a/www/secmail/views/actions/icla.json.rb b/www/secmail/views/actions/icla.json.rb
index 7b407d1..8a49cd4 100644
--- a/www/secmail/views/actions/icla.json.rb
+++ b/www/secmail/views/actions/icla.json.rb
@@ -87,7 +87,6 @@ _task "svn commit foundation/officers/iclas.txt" do
     _.system! 'svn', 'commit', dest, '-m', "ICLA from #{@pubname}",
       ['--non-interactive', '--no-auth-cache'],
       ['--username', env.user.untaint, '--password', env.password.untaint]
-
   end
 end
 
@@ -101,8 +100,12 @@ _task "email #@email" do
   mail = Mail.new(ERB.new(File.read(template).untaint).result(binding))
 
   # adjust copy lists
-  mail.cc = (mail.cc + message.cc).uniq if message.cc
-  mail.bcc = message.bcc - mail.cc if message.bcc
+  cc = mail.cc # from the template
+  cc += message.cc if message.cc # from the email message
+  cc << "private@#{pmc.mail_list}.apache.org" if pmc # copy pmc
+  cc << podling.private_mail_list if podling # copy podling
+  mail.cc = cc.uniq
+  mail.bcc = message.bcc - cc if message.bcc
 
   # add reply info
   mail.in_reply_to = message.id
diff --git a/www/secmail/views/forms/icla.js.rb b/www/secmail/views/forms/icla.js.rb
index d09507a..24ef207 100644
--- a/www/secmail/views/forms/icla.js.rb
+++ b/www/secmail/views/forms/icla.js.rb
@@ -131,8 +131,10 @@ class ICLA < React
 
   # handle ICLA form submission
   def file(event)
-    @submitted = true
-    @filed = true
+    setTimeout 0 do
+      @submitted = true
+      @filed = true
+    end
   end
 
   # validate userid is available

-- 
To stop receiving notification emails like this one, please contact
['"commits@whimsical.apache.org" <co...@whimsical.apache.org>'].