whimsical-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From s...@apache.org
Subject [whimsy] branch master updated: Docco
Date Thu, 07 Mar 2019 18:41:18 GMT
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 0b1d2a4  Docco
0b1d2a4 is described below

commit 0b1d2a465fe31c71f13eb503f9a0764c66dfe004
Author: Sebb <sebb@apache.org>
AuthorDate: Thu Mar 7 18:41:16 2019 +0000

    Docco
---
 lib/whimsy/asf/member.rb | 4 +++-
 www/roster/main.rb       | 2 +-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/lib/whimsy/asf/member.rb b/lib/whimsy/asf/member.rb
index 13c256f..1d00e1e 100644
--- a/lib/whimsy/asf/member.rb
+++ b/lib/whimsy/asf/member.rb
@@ -27,6 +27,7 @@ module ASF
     # return a list of <tt>members.txt</tt> entries as a Hash.  Keys are
     # availids.  Values are a Hash with the following keys:
     # <tt>:text</tt>, <tt>:name</tt>, <tt>"status"</tt>.
+    # Active members are those with no 'status' value
     def self.list
       result = Hash[self.new.map {|id, text|
         [id, {text: text, name: self.get_name(text)}]
@@ -50,10 +51,11 @@ module ASF
       nil
     end
 
-    # Return a hash of non-active ASF members and their status.  Keys are
+    # Return a hash of *non-active* ASF members and their status.  Keys are
     # availids.  Values are strings from the section header under which the
     # member is listed: currently either <tt>Emeritus (Non-voting) Member</tt>
     # or <tt>Deceased Member</tt>.
+    # N.B. Does NOT return active members
     def self.status
       begin
         @status = nil if @mtime != @@mtime
diff --git a/www/roster/main.rb b/www/roster/main.rb
index 7db03d6..3432810 100755
--- a/www/roster/main.rb
+++ b/www/roster/main.rb
@@ -42,7 +42,7 @@ get '/' do
     @committers = ASF::Person.list
     @committees = ASF::Committee.pmcs
     @nonpmcs = ASF::Committee.nonpmcs
-    @members = ASF::Member.list.keys - ASF::Member.status.keys
+    @members = ASF::Member.list.keys - ASF::Member.status.keys # i.e. active member ids
     @groups = Group.list
     @podlings = ASF::Podling.to_h.values
     _html :index


Mime
View raw message