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 11d02248 Consolidate duplicate 'nominations closed' messages. (#298)
11d02248 is described below
commit 11d02248d99f241e812feb789b8f3aaefe5b50be
Author: Rich Bowen <[email protected]>
AuthorDate: Wed Mar 25 12:52:22 2026 -0400
Consolidate duplicate 'nominations closed' messages. (#298)
---
www/members/nominate_board.cgi | 53 ++++++++++++++++--------------------------
1 file changed, 20 insertions(+), 33 deletions(-)
diff --git a/www/members/nominate_board.cgi b/www/members/nominate_board.cgi
index 18063dcb..65a702ae 100755
--- a/www/members/nominate_board.cgi
+++ b/www/members/nominate_board.cgi
@@ -192,52 +192,39 @@ _html do
if nomclosed
_h1 'Nominations are now closed!'
_p 'Sorry, no further nominations will be accepted for ballots at this
meeting.'
+ _a 'See existing nominations.', href: '/members/check_boardnoms.cgi'
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: 'nomination-form' do
- if _.post?
- unless nomclosed
+ _div id: 'nomination-form' do
+ if _.post?
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'
- if process_form(formdata: submission, wunderbar: _)
- _div.alert.alert_success role: 'alert' do
- _p "Your nomination was submitted to svn; now sending email to
#{MAILING_LIST}."
+ if valid == 'OK'
+ if process_form(formdata: submission, wunderbar: _)
+ _div.alert.alert_success role: 'alert' do
+ _p "Your nomination was submitted to svn; now sending email
to #{MAILING_LIST}."
+ end
+ mailval = send_nomination_mail(formdata: submission)
+ _pre mailval
+ else
+ _div.alert.alert_danger role: 'alert' do
+ _p do
+ _span.strong "ERROR: Form data invalid in process_form(),
update was NOT submitted!"
+ _br
+ _ "#{submission}"
+ end
+ end
end
- mailval = send_nomination_mail(formdata: submission)
- _pre mailval
else
_div.alert.alert_danger role: 'alert' do
_p do
- _span.strong "ERROR: Form data invalid in process_form(),
update was NOT submitted!"
+ _span.strong "ERROR: Form data invalid in validate_form(),
update was NOT submitted!"
_br
- _ "#{submission}"
+ _p valid
end
end
end
- else
- _div.alert.alert_danger role: 'alert' do
- _p do
- _span.strong "ERROR: Form data invalid in validate_form(),
update was NOT submitted!"
- _br
- _p valid
- end
- end
- end
- else # if _.post?
- if nomclosed
- _p do
- _ 'Sorry, no further nominations will be accepted for ballots at
this meeting.'
- _br
- _a 'See existing nominations.', href:
'/members/check_boardnoms.cgi'
- end
else
emit_form('Enter your nomination for a Director Nominee', {})
end
