You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@whimsical.apache.org by se...@apache.org on 2020/05/25 13:14:34 UTC

[whimsy] branch master updated: Use the ICLA method to check the id

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 a6c5490  Use the ICLA method to check the id
a6c5490 is described below

commit a6c54900874cacfd2b8ddb83c5493170de7195a1
Author: Sebb <se...@apache.org>
AuthorDate: Mon May 25 14:14:12 2020 +0100

    Use the ICLA method to check the id
---
 lib/whimsy/asf/mail.rb         | 2 +-
 www/roster/main.rb             | 4 ++--
 www/roster/public_icla_info.rb | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/lib/whimsy/asf/mail.rb b/lib/whimsy/asf/mail.rb
index 3d84d69..a556eb2 100644
--- a/lib/whimsy/asf/mail.rb
+++ b/lib/whimsy/asf/mail.rb
@@ -32,7 +32,7 @@ module ASF
       ASF::ICLA.each do |icla|
         person = Person.find(icla.id)
         list[icla.email.downcase] ||= person
-        next if icla.id == 'notinavail'
+        next if icla.noId?
         list["#{icla.id.downcase}@apache.org"] ||= person
       end
 
diff --git a/www/roster/main.rb b/www/roster/main.rb
index 2d7f2ae..d6fe5e2 100755
--- a/www/roster/main.rb
+++ b/www/roster/main.rb
@@ -143,7 +143,7 @@ get '/committer2/index.json' do
     }
 
     ASF::ICLA.each {|icla|
-      if icla.id == 'notinavail'
+      if icla.noId?
         iclaFile = ASF::ICLAFiles.match_claRef(icla.claRef)
         tmp << { name: icla.name, mail: icla.email, claRef: icla.claRef, iclaFile: iclaFile}
       end
@@ -226,7 +226,7 @@ get '/icla/index.json' do
     # build a list of ICLA Public names, email addresses and icla files
     tmp = []
     ASF::ICLA.each {|icla|
-      if icla.id == 'notinavail'
+      if icla.noId?
         iclaFile = ASF::ICLAFiles.match_claRef(icla.claRef)
         tmp << { name: icla.name, mail: icla.email, claRef: icla.claRef, iclaFile: iclaFile}
       end
diff --git a/www/roster/public_icla_info.rb b/www/roster/public_icla_info.rb
index 03ae621..cfc6af5 100644
--- a/www/roster/public_icla_info.rb
+++ b/www/roster/public_icla_info.rb
@@ -7,7 +7,7 @@ ids = {}
 noid = []
 
 ASF::ICLA.each do |entry|
-  if entry.id == 'notinavail'
+  if entry.noId?
     noid << entry.name
   else
     ids[entry.id] = entry.name