[whimsy] branch master updated: don't show emeritus and deceased members as "active"

[rubys]

This is an automated email from the ASF dual-hosted git repository.

rubys 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 02376954 don't show emeritus and deceased members as "active"
02376954 is described below

commit 0237695459bd169b8bc335b6f6e9710753c64649
Author: Sam Ruby <ru...@intertwingly.net>
AuthorDate: Mon Apr 18 19:36:20 2022 -0400

    don't show emeritus and deceased members as "active"
---
 www/members/inactive.cgi | 14 +++++++++++---
 1 file changed, 11 insertions(+), 3 deletions(-)

diff --git a/www/members/inactive.cgi b/www/members/inactive.cgi
index 01b32de8..21d93e1b 100755
--- a/www/members/inactive.cgi
+++ b/www/members/inactive.cgi
@@ -97,11 +97,19 @@ _html do
       }
     ) do
 
+      member_status = ASF::Person.find(@user).asf_member?
+
       _p_ do
-        _span "#{name}, your current meeting attendance status is: "
-        _code tracker[@user]['status']
+        if member_status != true
+          _span "#{name}, your current membership status is: "
+          _code member_status
+        else
+          _span "#{name}, your current meeting attendance status is: "
+          _code tracker[@user]['status']
+        end
       end
-      if active
+
+      if active and member_status == true
         att = miss = 0
         if !matrix.nil?
           matrix.each do |date, status|