[whimsy] branch master updated: Tweak output

[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 86e165ee Tweak output
86e165ee is described below

commit 86e165ee581a24df6bf5049c9e58134637e6714f
Author: Sebb <s...@apache.org>
AuthorDate: Sat Aug 12 14:27:16 2023 +0100

    Tweak output
---
 www/secretary/ldap-check.cgi | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/www/secretary/ldap-check.cgi b/www/secretary/ldap-check.cgi
index 0c68ddaf..90b7bcad 100755
--- a/www/secretary/ldap-check.cgi
+++ b/www/secretary/ldap-check.cgi
@@ -124,6 +124,9 @@ _html do
               if ASF::Person[id].nologin?
                 _ 'NoLogin'
               end
+              if ASF::Person[id].asf_banned?
+                _ 'Banned'
+              end
               _br
             end
           end
@@ -132,14 +135,13 @@ _html do
     end
   end
 
-  _h2 'people who are not committers (excluding nologin)'
+  _h2 'people who are not committers (excluding nologin or banned)'
 
-  non_committers = people.reject { |p| p.nologin? or cmtgrp.include? p.name or 
p.name == 'apldaptest'}
+  non_committers = people.reject { |p| p.inactive? or cmtgrp.include? p.name 
or p.name == 'apldaptest'}
   if non_committers.length > 0
     _table do
       _tr do
         _th 'UID'
-        _th 'asf-banned?'
         _th 'Date'
         _th 'ICLA'
         _th 'Subscriptions'
@@ -151,7 +153,6 @@ _html do
           _td do
             _a p.name, href: '/roster/committer/' + p.name
           end
-          _td p.asf_banned?
           _td p.createDate
           if icla
             if icla.claRef