[whimsy] branch master updated: Show qualifying roles

[se...@apache.org]

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 6e523d6  Show qualifying roles
6e523d6 is described below

commit 6e523d60c2bd704b132caf9e7ff6694d7cf54807
Author: Sebb <se...@apache.org>
AuthorDate: Sun Jun 28 12:19:18 2020 +0100

    Show qualifying roles
---
 www/officers/coi.cgi | 13 ++++++++++---
 1 file changed, 10 insertions(+), 3 deletions(-)

diff --git a/www/officers/coi.cgi b/www/officers/coi.cgi
index 3336fb1..5f46d75 100755
--- a/www/officers/coi.cgi
+++ b/www/officers/coi.cgi
@@ -17,11 +17,16 @@ user = ASF::Person.find($USER)
 USERID = user.id
 USERNAME = user.cn.untaint
 USERMAIL = "#{USERID}@apache.org".untaint
+IDS = Hash.new {|h,k| h[k]=Array.new}
 committees = ASF::Committee.officers + ASF::Committee.nonpmcs
 chairs = committees.map do |committee|
- committee.chairs.map {|chair| chair[:id]}
+  committee.chairs.each do |chair|
+    IDS[chair[:id]] << committee.display_name
+  end
+end
+ASF::Service['board'].members.each do |member|
+  IDS[member.id] << 'Board'
 end
-IDS = (chairs.flatten + ASF::Service['board'].members.map(&:id)).uniq
 
 # Get the list of files in this year's directory
 signerfileslist, err = ASF::SVN.svn('list', COI_CURRENT_URL, {user: $USER.dup.untaint, password: $PASSWORD.dup.untaint})
@@ -105,15 +110,17 @@ _html do
             _tr do
               _th 'Name'
               _th 'AvailId'
+              _th 'Role(s)'
               _th 'Link to affirmation(s)'
             end
           end
           _tbody do
-            IDS.each do |id|
+            IDS.each do |id, role|
               affirmer = ASF::Person.find(id)
               _tr do
                 _td affirmer.cn
                 _td affirmer.id 
+                _td role.join(', ')
                 _td do
                   signerfile = SIGNERS[affirmer.id]
                   if signerfile