[whimsy] branch master updated: Ensure proxies file only has one line per proxy

[cu...@apache.org]

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

curcuru 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 20c31a9  Ensure proxies file only has one line per proxy
20c31a9 is described below

commit 20c31a98080b0eb8839e7bbde6094f60cbf8b12e
Author: Shane Curcuru <as...@shanecurcuru.org>
AuthorDate: Wed Mar 20 10:08:42 2019 -0400

    Ensure proxies file only has one line per proxy
    
    Corrects earlier side effect introduced in e981bf7
    Fixes WHIMSY-244
---
 www/members/proxy.cgi | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/www/members/proxy.cgi b/www/members/proxy.cgi
index 4f53bd1..c832e7c 100755
--- a/www/members/proxy.cgi
+++ b/www/members/proxy.cgi
@@ -161,6 +161,7 @@ _html do
                 next if exclude.include? member.id       # Not attending
                 next unless members_txt[member.id]       # Non-members
                 next if members_txt[member.id]['status'] # Emeritus/Deceased
+                # Display the availid to users to match volunteers array above
                 _option "#{member.public_name} (#{member.id})"
               end
             end
@@ -243,6 +244,8 @@ _html do
               id = file[/([-A-Za-z0-9]+)\.\w+$/, 1]
               proxy = form[/hereby authorize ([\S].*) to act/, 1].
                 gsub('_', ' ').strip
+              # Ensure availid is not included in proxy name here
+              proxy = proxy[/([^(]+)/, 1].strip
               name = form[/signature: ([\S].*)/, 1].gsub(/[\/_]/, ' ').strip
 
               "   #{proxy.ljust(24)} #{name} (#{id})"