[whimsy] branch master updated: Don't show current members

[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 26c97b8f Don't show current members
26c97b8f is described below

commit 26c97b8f9e7907cef32eb5f548d6e62411fc35c2
Author: Sebb <s...@apache.org>
AuthorDate: Thu Apr 13 11:52:23 2023 +0100

    Don't show current members
---
 www/members/watch.cgi | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/www/members/watch.cgi b/www/members/watch.cgi
index 46026100..972d3bd4 100755
--- a/www/members/watch.cgi
+++ b/www/members/watch.cgi
@@ -33,7 +33,7 @@ _html do
       watch_list = ASF::Person.member_watch_list.keys
       meeting = ASF::MemberFiles.latest_meeting
 
-      nominations = ASF::MemberFiles.member_nominees.map {|k, _v| k}
+      nominations = ASF::MemberFiles.member_nominees.keys
 
       # determine which list to report on, based on the URI
       request = ENV['REQUEST_URI']
@@ -115,7 +115,8 @@ _html do
         list -= ASF.members
       elsif request =~ /nominees/
         _h2_ 'Member Nominees'
-        list = nominations.uniq.map {|id| ASF::Person.find(id)}
+        # Keep only ids that are not current members
+        list = nominations.map {|id| ASF::Person.find(id)}.reject{|p| 
p.asf_member_status == :current}
       elsif request =~ /appstatus/
         _h2_ 'Elected Members - Application Status'
         status = File.read(File.join(meeting, 'memapp-received.txt')).