[whimsy] branch master updated: Use actual PMC rosters rather than relying on ou=pmc

[sebb]

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 2c9b3ce  Use actual PMC rosters rather than relying on ou=pmc
2c9b3ce is described below

commit 2c9b3ce28bcc9fcddd26e771a3a283af02c3d96a
Author: Sebb <s...@apache.org>
AuthorDate: Mon Feb 11 09:52:51 2019 +0000

    Use actual PMC rosters rather than relying on ou=pmc
---
 www/members/watch.cgi | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/www/members/watch.cgi b/www/members/watch.cgi
index 41b0d66..1079cb4 100755
--- a/www/members/watch.cgi
+++ b/www/members/watch.cgi
@@ -101,9 +101,14 @@ _html do
     list = {} # Avoid lint errors of shadowing
     if request =~ /multiple/
       _h2_ 'Active In Multiple Committees'
-      list = ASF::Committee.list.map {|committee| committee.members}.
-        reduce(&:+).group_by {|person| person}.
-        delete_if {|person,list| list.length<3}.keys
+#      list = ASF::Committee.list.map {|committee| committee.members}.
+#        reduce(&:+).group_by {|person| person}.
+#        delete_if {|person,list| list.length<3}.keys
+      # Use actual PMCs rather than LDAP derived
+      list = ASF::Committee.pmcs.map {|pmc| pmc.roster.keys}.
+        reduce(&:+).group_by {|uid| uid}.
+        delete_if {|uid,list| list.length<3}.
+        map{|uid,list| ASF::Person.find(uid)}
       list -= ASF.members
     elsif request =~ /chairs/
       _h2_ 'PMC Chairs'