[whimsy] branch master updated: correct roster link for nonpmc's

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


The following commit(s) were added to refs/heads/master by this push:
     new d184b4a  correct roster link for nonpmc's
d184b4a is described below

commit d184b4a78baabfc92d3f261bfd8f8bca10edacc3
Author: Sam Ruby <ru...@intertwingly.net>
AuthorDate: Tue Jul 9 22:53:24 2019 -0400

    correct roster link for nonpmc's
---
 www/roster/views/actions/committee.json.rb | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/www/roster/views/actions/committee.json.rb b/www/roster/views/actions/committee.json.rb
index 3bf5856..d1f8f68 100644
--- a/www/roster/views/actions/committee.json.rb
+++ b/www/roster/views/actions/committee.json.rb
@@ -65,6 +65,12 @@ if env.password
 
   from = ASF::Person.find(env.user)
 
+  if ASF::Committee.nonpmcs.include? pmc
+    project_type = 'nonpmc'
+  else
+    project_type = 'committee'
+  end
+
   # draft email
   mail = Mail.new do
     from "#{from.public_name} <#{...@apache.org>".untaint
@@ -73,7 +79,7 @@ if env.password
     bcc "root@apache.org"
     subject "#{who} #{action} #{pmc.display_name} #{list}"
     body "Current roster can be found at:\n\n" +
-      "  https://whimsy.apache.org/roster/committee/#{pmc.id}\n\n" +
+      "  https://whimsy.apache.org/roster/#{project_type}/#{pmc.id}\n\n" +
       "LDAP details:\n\n  #{details.join("\n  ")}"
   end