whimsical-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From c..@apache.org
Subject [whimsy] branch master updated: Add body to affirmation email
Date Sat, 27 Jun 2020 23:21:13 GMT
This is an automated email from the ASF dual-hosted git repository.

clr 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 c9495e9  Add body to affirmation email
c9495e9 is described below

commit c9495e9e5c3150cef59a70206ceb23b160fd932a
Author: Craig L Russell <apache.clr@gmail.com>
AuthorDate: Sat Jun 27 16:20:55 2020 -0700

    Add body to affirmation email
---
 www/officers/coi.cgi | 13 +++++++++++--
 1 file changed, 11 insertions(+), 2 deletions(-)

diff --git a/www/officers/coi.cgi b/www/officers/coi.cgi
index f271c50..cfc562b 100755
--- a/www/officers/coi.cgi
+++ b/www/officers/coi.cgi
@@ -16,7 +16,7 @@ COI_CURRENT_TEMPLATE_URL = File.join(COI_CURRENT_URL, 'template.txt')
 user = ASF::Person.find($USER)
 USERID = user.id
 USERNAME = user.cn.untaint
-USERMAIL = user.mail.first.untaint
+USERMAIL = "#{USERID}@apache.org".untaint
 committees = ASF::Committee.officers + ASF::Committee.nonpmcs
 chairs = committees.map do |committee|
  committee.chairs.map {|chair| chair[:id]}
@@ -203,7 +203,16 @@ def emit_post(_)
  #     cc "secretary@apache.org"
       from "#{USERMAIL}"
       subject "Conflict of Interest affirmation from #{USERNAME}"
-      body "This year's Conflict of Interest affirmation is attached."
+      text_part do
+        body "
+DRAFT DRAFT DRAFT Please review this; nothing has been checked in.
+Send feedback to dev@whimsical.apache.org
+This year's Conflict of Interest affirmation is attached.
+It has been checked into the foundation repository at
+#{COI_CURRENT_URL}/#{user_filename}.\n
+Regards,\n
+#{USERNAME}\n\n"
+      end
     end
     mail.attachments["#{USERID}.txt"] = affirmed
     mail.deliver!


Mime
View raw message