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

commit e9151da74b92fe2c6ed71000d1164ece1ace3b02
Author: Sebb <[email protected]>
AuthorDate: Fri Jan 5 23:08:51 2024 +0000

    Allow for domain already in mail_list
---
 www/board/agenda/views/actions/send-reminders.json.rb | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/www/board/agenda/views/actions/send-reminders.json.rb 
b/www/board/agenda/views/actions/send-reminders.json.rb
index 5610d892..9910c4a1 100644
--- a/www/board/agenda/views/actions/send-reminders.json.rb
+++ b/www/board/agenda/views/actions/send-reminders.json.rb
@@ -49,13 +49,15 @@ Agenda.parse(@agenda, :full).each do |item|
 
   # cc list
   cclist = []
-  if item['mail_list']
+  mail_list = item['mail_list']
+  if mail_list
     if @selection == 'inactive'
-      cclist << "dev@#{item['mail_list']}.apache.org"
+      cclist << "dev@#{mail_list}.apache.org"
     elsif item[:attach] =~ /^[A-Z]+/
-      cclist << "private@#{item['mail_list']}.apache.org"
-    else
-      cclist << "#{item['mail_list']}@apache.org"
+      cclist << "private@#{mail_list}.apache.org"
+    else # This is not a PMC, and the mail_list may already include the domain
+      mail_list = mail_list + '@apache.org' unless mail_list.include? '@'
+      cclist << mail_list
     end
   end
 

Reply via email to