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 88d3d8fa Seconds are still allowed
88d3d8fa is described below
commit 88d3d8fa2a9e2f6e4f17cc3078106e0ff99f4f34
Author: Sebb <[email protected]>
AuthorDate: Sun Feb 22 10:54:53 2026 +0000
Seconds are still allowed
---
www/members/second_board.cgi | 27 ++++-----------------------
www/members/second_member.cgi | 29 ++++-------------------------
2 files changed, 8 insertions(+), 48 deletions(-)
diff --git a/www/members/second_board.cgi b/www/members/second_board.cgi
index f3d5665f..e2df563b 100755
--- a/www/members/second_board.cgi
+++ b/www/members/second_board.cgi
@@ -186,24 +186,11 @@ _html do
}
) do
- if nomclosed
- _h1 'Nominations are now closed!'
- _p 'Sorry, no further seconds will be accepted for ballots at this
meeting.'
- else
- _h3 "Nominations close in #{ASFTime.secs2text(t_end - t_now)} at
#{Time.at(t_end).utc} for Meeting: #{timelines['meeting_iso']}"
- end
-
_div id: 'second-form' do
if _.post?
- unless nomclosed
- submission = _whimsy_params2formdata(params)
- valid = validate_form(formdata: submission)
- end
- if nomclosed
- _div.alert.alert_warning role: 'alert' do
- _p "Nominations have closed"
- end
- elsif valid == 'OK'
+ submission = _whimsy_params2formdata(params)
+ valid = validate_form(formdata: submission)
+ if valid == 'OK'
if process_form(formdata: submission, wunderbar: _)
_div.alert.alert_success role: 'alert' do
_p "Your second was submitted to svn; now sending email to
#{MAILING_LIST}."
@@ -228,13 +215,7 @@ _html do
end
end
else # if _.post?
- if nomclosed
- _p do
- _ 'Sorry, no further seconds will be accepted for ballots at
this meeting.'
- end
- else
- emit_form('Enter your New Board second', {}, nominations.keys)
- end
+ emit_form('Enter your New Board second', {}, nominations.keys)
end
end
end
diff --git a/www/members/second_member.cgi b/www/members/second_member.cgi
index cde1b40c..941460aa 100755
--- a/www/members/second_member.cgi
+++ b/www/members/second_member.cgi
@@ -188,24 +188,11 @@ _html do
}
) do
- if nomclosed
- _h1 'Nominations are now closed!'
- _p 'Sorry, no further seconds will be accepted for ballots at this
meeting.'
- else
- _h3 "Nominations close in #{ASFTime.secs2text(t_end - t_now)} at
#{Time.at(t_end).utc} for Meeting: #{timelines['meeting_iso']}"
- end
-
_div id: 'second-form' do
if _.post?
- unless nomclosed
- submission = _whimsy_params2formdata(params)
- valid = validate_form(formdata: submission)
- end
- if nomclosed
- _div.alert.alert_warning role: 'alert' do
- _p "Nominations have closed"
- end
- elsif valid == 'OK'
+ submission = _whimsy_params2formdata(params)
+ valid = validate_form(formdata: submission)
+ if valid == 'OK'
if process_form(formdata: submission, wunderbar: _)
_div.alert.alert_success role: 'alert' do
_p "Your second was submitted to svn; now sending email to
#{MAILING_LIST}."
@@ -230,15 +217,7 @@ _html do
end
end
else # if _.post?
- if nomclosed
- _p do
- _ 'Sorry, no further seconds will be accepted for ballots at
this meeting.'
- # _br
- # _a 'See existing nominations.', href:
'/members/check_membernoms.cgi'
- end
- else
- emit_form('Enter your New Member second', {}, nominations.keys)
- end
+ emit_form('Enter your New Member second', {}, nominations.keys)
end
end
end
