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 c1f74ac3 Allow for missing public name
c1f74ac3 is described below
commit c1f74ac3a284d6285a39c90ef98385e9a45a4993
Author: Sebb <[email protected]>
AuthorDate: Sun Feb 2 23:25:34 2025 +0000
Allow for missing public name
---
www/members/proxy.cgi | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/www/members/proxy.cgi b/www/members/proxy.cgi
index ce38c701..8b9c4202 100755
--- a/www/members/proxy.cgi
+++ b/www/members/proxy.cgi
@@ -130,14 +130,14 @@ def emit_form(cur_mtg_dir, meeting, volunteers, disabled)
if meeting != '20220615'
_option 'Select an ASF Member', :selected, value: ''
end
-
- ldap_members.sort_by(&:public_name).each do |member|
+ # Allow for missing public name (should not happen unless LDAP
is inconsistent)
+ ldap_members.sort_by{|m| m.public_name || '_'}.each do |member|
next if member.id == $USER # No self proxies
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})",
+ _option "#{member.public_name || '?No public name?'}
(#{member.id})",
selected: (member.id == secretary_id)
end
end