You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@whimsical.apache.org by cl...@apache.org on 2020/07/08 22:00:03 UTC
[whimsy] branch roster-emeritus updated (b0e80d2 -> f1733a6)
This is an automated email from the ASF dual-hosted git repository.
clr pushed a change to branch roster-emeritus
in repository https://gitbox.apache.org/repos/asf/whimsy.git.
from b0e80d2 Remove debug code
new 9980c47 Change emeritus request email from request to ack
new f1733a6 Enable writing the emeritus request
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/roster/views/actions/memstat.json.rb | 17 ++++++++++-------
1 file changed, 10 insertions(+), 7 deletions(-)
[whimsy] 01/02: Change emeritus request email from request to ack
Posted by cl...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
clr pushed a commit to branch roster-emeritus
in repository https://gitbox.apache.org/repos/asf/whimsy.git
commit 9980c47a83dc60a6df4d2b476774a8fb32d44635
Author: Craig L Russell <ap...@gmail.com>
AuthorDate: Wed Jul 8 14:35:06 2020 -0700
Change emeritus request email from request to ack
---
www/roster/views/actions/memstat.json.rb | 11 +++++------
1 file changed, 5 insertions(+), 6 deletions(-)
diff --git a/www/roster/views/actions/memstat.json.rb b/www/roster/views/actions/memstat.json.rb
index 9ec7068..5cf00c2 100644
--- a/www/roster/views/actions/memstat.json.rb
+++ b/www/roster/views/actions/memstat.json.rb
@@ -84,12 +84,11 @@ elsif @action == 'request_emeritus'
ASF::Mail.configure
mail = Mail.new do
- to "secretary@apache.org"
- cc "#{USERNAME}<#{USERMAIL}>"
- from "#{USERMAIL}"
- subject "Emeritus request from #{USERNAME}"
+ from "secretary@apache.org"
+ to "#{USERNAME}<#{USERMAIL}>"
+ subject "Emeritus request acknowledgement from #{USERNAME}"
text_part do
- body "Please accept my emeritus request, which is attached.\n\nRegards,\n\n#{USERNAME}\n\n"
+ body "This acknowledges receipt of your emeritus request, a copy of which is attached for your records.\n\nRegards,\n\nsecretary@apache.org\n\n"
end
end
mail.attachments["#{USERID}.txt"] = signed_request.untaint
@@ -102,7 +101,7 @@ elsif @action == 'request_reinstatement'
from "#{USERMAIL}"
subject "Emeritus reinstatement request from #{USERNAME}"
text_part do
- body "I respectfully request reinstatement to full membership.\n\nRegards,\n\n#{USERNAME}"
+ body "I respectfully request reinstatement to full membership in The Apache Software Foundation.\n\nRegards,\n\n#{USERNAME}"
end
end
mail.deliver!
[whimsy] 02/02: Enable writing the emeritus request
Posted by cl...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
clr pushed a commit to branch roster-emeritus
in repository https://gitbox.apache.org/repos/asf/whimsy.git
commit f1733a6ea633ace6491e3e28799c65ea157cc380
Author: Craig L Russell <ap...@gmail.com>
AuthorDate: Wed Jul 8 14:59:33 2020 -0700
Enable writing the emeritus request
---
www/roster/views/actions/memstat.json.rb | 8 ++++++--
1 file changed, 6 insertions(+), 2 deletions(-)
diff --git a/www/roster/views/actions/memstat.json.rb b/www/roster/views/actions/memstat.json.rb
index 5cf00c2..dab18b0 100644
--- a/www/roster/views/actions/memstat.json.rb
+++ b/www/roster/views/actions/memstat.json.rb
@@ -63,7 +63,7 @@ if @action == 'rescind_emeritus'
emeritus_rescinded_url = ASF::SVN.svnurl('emeritus-requests-rescinded')
ASF::SVN.svn_('mv', [@emeritusfileurl, emeritus_rescinded_url], _, {env:env, msg:message})
elsif @action == 'request_emeritus'
- # Create mail to secretary requesting emeritus
+ # Create emeritus request and send mail from secretary
FOUNDATION_URL = ASF::SVN.svnurl('foundation')
EMERITUS_TEMPLATE_URL = ASF::SVN.svnpath!('foundation', 'emeritus-request.txt').untaint
template, err =
@@ -81,6 +81,10 @@ elsif @action == 'request_emeritus'
'Signed by validated user at: ________Whimsy www/committer_________')
.gsub('Date: _________________________________',
('Date: _______' + centered_date))
+ # Write the emeritus request to emeritus-requests-received
+ EMERITUS_REQUEST_URL = ASF::SVN.svnpath('emeritus-requests-received').untaint
+ rc = ASF::SVN.create_(EMERITUS_REQUEST_URL, "#{USERID}.txt", signed_request, "Emeritus request from #{USERNAME} (#{USERID}", env, _)
+ if rc == 1 break # do nothing if there is already an emeritus request
ASF::Mail.configure
mail = Mail.new do
@@ -88,7 +92,7 @@ elsif @action == 'request_emeritus'
to "#{USERNAME}<#{USERMAIL}>"
subject "Emeritus request acknowledgement from #{USERNAME}"
text_part do
- body "This acknowledges receipt of your emeritus request, a copy of which is attached for your records.\n\nRegards,\n\nsecretary@apache.org\n\n"
+ body "This acknowledges receipt of your emeritus request. You can find the request at #{EMERITUS_REQUEST_URL}/#{USERID}.txt. A copy is attached for your records.\n\nRegards,\n\nsecretary@apache.org\n\n"
end
end
mail.attachments["#{USERID}.txt"] = signed_request.untaint