[whimsy] branch master updated: Better handling of members with no uid

[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 0a1ed28  Better handling of members with no uid
0a1ed28 is described below

commit 0a1ed28582c481597994b5bd4d62d129365a256e
Author: Sebb <se...@apache.org>
AuthorDate: Wed May 27 11:48:38 2020 +0100

    Better handling of members with no uid
---
 www/secretary/memapp_check.cgi | 20 ++++++++++++--------
 1 file changed, 12 insertions(+), 8 deletions(-)

diff --git a/www/secretary/memapp_check.cgi b/www/secretary/memapp_check.cgi
index 12b61d0..7f108ff 100755
--- a/www/secretary/memapp_check.cgi
+++ b/www/secretary/memapp_check.cgi
@@ -11,9 +11,21 @@ require 'whimsy/asf'
 require 'whimsy/asf/memapps'
 require 'wunderbar'
 
+# Dummy class for members that don't have ids but do have membership apps
+class PersonNoId
+  attr_reader :member_name
+  def initialize name
+    @member_name = name
+  end
+end
 status = ASF::Member.status
 
 members = ASF::Member.new.map {|id, text| ASF::Person.find(id)}
+  
+# These members don't have ids, so cannot use the Person class
+members << PersonNoId.new("Shane Caraveo")
+members << PersonNoId.new("Robert Hartill")
+members << PersonNoId.new("Andrew Wilson")
 
 files = Hash[ASF::MemApps.names.map{|i| [i,'NAK']}]
 nofiles = Hash.new()
@@ -39,14 +51,6 @@ _html do
 
   _h2 'Files in member_apps that do not match any ASF member names'
 
-  _p do
-    _ "The following entries don't have Avail IDs and are therefore not available for matching:"
-    _ul do
-      _li 'Shane Caraveo'
-      _li 'Robert Hartill'
-      _li 'Andrew Wilson'
-    end
-  end
   _table_ do
     _tr do
       _th 'Name'