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 719a360 Move exclude read into correct place
719a360 is described below
commit 719a360854e9d0008c57152fd607a2209759231b
Author: Shane Curcuru <[email protected]>
AuthorDate: Sun Jan 19 18:58:24 2020 -0500
Move exclude read into correct place
---
www/members/proxy.cgi | 7 ++++---
1 file changed, 4 insertions(+), 3 deletions(-)
diff --git a/www/members/proxy.cgi b/www/members/proxy.cgi
index 551aa17..cc828b5 100755
--- a/www/members/proxy.cgi
+++ b/www/members/proxy.cgi
@@ -102,6 +102,10 @@ def emit_form(cur_mtg_dir, meeting, volunteers)
# Fetch members.txt
members_txt = ASF::Member.list
+ # get a list of members who have submitted proxies
+ exclude = Dir[File.join(cur_mtg_dir,'proxies-received', '*')].
+ map {|name| name[/(\w+)\.\w+$/, 1]}
+
_select.combobox.input_large.form_control name: 'proxy' do
_option 'Select an ASF Member', :selected, value: ''
ldap_members.sort_by(&:public_name).each do |member|
@@ -252,9 +256,6 @@ _html do
cur_mtg_dir = MeetingUtil.get_latest(MEETINGS).untaint
meeting = File.basename(cur_mtg_dir)
today = Date.today.strftime('%Y%m%d')
- # get a list of members who have submitted proxies
- exclude = Dir[File.join(cur_mtg_dir,'proxies-received', '*')].
- map {|name| name[/(\w+)\.\w+$/, 1]}
_whimsy_body(
title: PAGETITLE,
subtitle: today > meeting ? "ERROR: Next Meeting Data Not Available" :
"How To Assign A Proxy For Upcoming Meeting",