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 db83a48 Make the committee name variable
db83a48 is described below
commit db83a487a2e22d238842f9f2cd95e2aa42beeb46
Author: Sebb <[email protected]>
AuthorDate: Fri Apr 24 11:01:54 2020 +0100
Make the committee name variable
---
www/secretary/workbench/templates/resubmit.erb | 7 ++-----
www/secretary/workbench/views/actions/resubmit.json.rb | 4 ++++
2 files changed, 6 insertions(+), 5 deletions(-)
diff --git a/www/secretary/workbench/templates/resubmit.erb
b/www/secretary/workbench/templates/resubmit.erb
index b8a72f0..e451cec 100644
--- a/www/secretary/workbench/templates/resubmit.erb
+++ b/www/secretary/workbench/templates/resubmit.erb
@@ -1,15 +1,12 @@
Dear <%= @email.display_names.join(', ') %>,
Thanks for the ICLA, however we already have a copy.
-The (P)PMC can use the existing ICLA to request your account by using Whimsy:
+The <%= @cttee %> can use the existing ICLA to request your account by using
Whimsy:
https://whimsy.apache.org/officers/acreq.cgi
-Please take up any further queries with the (P)PMC.
+Please take up any further queries with the <%= @cttee %>.
Warm Regards,
<%= @sig %>
-
-pmc: <%= @pmc %>
-podling: <%= @podling %>
\ No newline at end of file
diff --git a/www/secretary/workbench/views/actions/resubmit.json.rb
b/www/secretary/workbench/views/actions/resubmit.json.rb
index 53c882c..c5a206a 100644
--- a/www/secretary/workbench/views/actions/resubmit.json.rb
+++ b/www/secretary/workbench/views/actions/resubmit.json.rb
@@ -15,6 +15,10 @@ _extract_project
task "email #{message.from}" do
# build mail from template
@email = message.from
+ # variable for 'The xxx can use'
+ @cttee = '(P)PMC'
+ @cttee = "Apache #{@podling.display_name} podling" if @podling
+ @cttee = "Apache #{@pmc.display_name} PMC" if @pmc
mail = message.reply(
from: @from,
cc: [
