[whimsy] branch master updated: Simplify - use common library method

[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 a3c20581 Simplify - use common library method
a3c20581 is described below

commit a3c20581a4e6ed3b722dcd31d8a03103b359dbed
Author: Sebb <s...@apache.org>
AuthorDate: Wed Feb 8 17:14:05 2023 +0000

    Simplify - use common library method
---
 lib/whimsy/asf/rack.rb         | 3 +--
 www/roster/main.rb             | 2 +-
 www/roster/views/index.html.rb | 4 ++--
 3 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/lib/whimsy/asf/rack.rb b/lib/whimsy/asf/rack.rb
index 9027300e..107842f6 100644
--- a/lib/whimsy/asf/rack.rb
+++ b/lib/whimsy/asf/rack.rb
@@ -75,8 +75,7 @@ module ASF
 
         person = ASF::Auth.decode(env)
 
-        authorized ||= person.asf_member?
-        authorized ||= ASF.pmc_chairs.include? person
+        authorized ||= person.asf_chair_or_member?
         authorized ||= @block.call(env) if @block
 
         if authorized
diff --git a/www/roster/main.rb b/www/roster/main.rb
index 31ac919c..1354b440 100755
--- a/www/roster/main.rb
+++ b/www/roster/main.rb
@@ -411,7 +411,7 @@ end
 get '/orgchart/:name' do |name|
   person = ASF::Person.find(env.user)
 
-  unless person.asf_member? or ASF.pmc_chairs.include? person
+  unless person.asf_chair_or_member?
     halt 401, "Not authorized\n"
   end
 
diff --git a/www/roster/views/index.html.rb b/www/roster/views/index.html.rb
index 86d62ac7..b091e00a 100644
--- a/www/roster/views/index.html.rb
+++ b/www/roster/views/index.html.rb
@@ -48,7 +48,7 @@ _html do
           end
         end
 
-        if person.asf_member? or ASF.pmc_chairs.include? person
+        if person.asf_chair_or_member?
           _tr do
             _td do
               _a @committers.length, href: 'committer2/'
@@ -166,7 +166,7 @@ _html do
 
       end
 
-      if person.asf_member? or ASF.pmc_chairs.include? person
+      if person.asf_chair_or_member?
         _hr
         _p do
           _a 'Search pending ICLAs', href: 'icla/'