(whimsy) branch master updated: Add email subject
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 fbbcfab8 Add email subject
fbbcfab8 is described below
commit fbbcfab8efe209114c064f04b10b4f05fd6e5a8b
Author: Sebb
AuthorDate: Sat Feb 10 00:28:39 2024 +
Add email subject
---
www/members/member_nominations.cgi | 7 +--
1 file changed, 5 insertions(+), 2 deletions(-)
diff --git a/www/members/member_nominations.cgi
b/www/members/member_nominations.cgi
index 0a24db5d..f9d23263 100755
--- a/www/members/member_nominations.cgi
+++ b/www/members/member_nominations.cgi
@@ -52,14 +52,17 @@ end
# @return true if we think it succeeded; false in all other cases
def process_form(formdata: {}, wunderbar: {})
statement = formdata['statement']
+ uid = formdata['availid']
_h3 'Copy of statement to put in an email (if necessary)'
- _pre statement
+ _pre do
+_ "[MEMBER NOMINATION] #{ASF::Person.new(uid).public_name} (#{uid})\n"
+_ statement
+ end
_hr
_h3 'Transcript of update to nomination file'
- uid = formdata['availid']
entry = ASF::MemberFiles.make_member_nomination({
availid: uid,
nomby: $USER,
(whimsy) branch master updated: Allow renomination of Emeritus
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 8abd8f1b Allow renomination of Emeritus
8abd8f1b is described below
commit 8abd8f1baffe32c6c6bd6a0ff20fbcd306060ee1
Author: Sebb
AuthorDate: Fri Feb 9 17:26:13 2024 +
Allow renomination of Emeritus
---
www/members/member_nominations.cgi | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/www/members/member_nominations.cgi
b/www/members/member_nominations.cgi
index 7898f946..0a24db5d 100755
--- a/www/members/member_nominations.cgi
+++ b/www/members/member_nominations.cgi
@@ -41,7 +41,8 @@ def validate_form(formdata: {})
uid = formdata['availid']
chk = ASF::Person[uid]&.asf_member?
chk.nil? and return "Invalid availid: #{uid}"
- chk and return "Already a member: #{uid}"
+ # Allow renomination of Emeritus
+ chk && !chk.to_s.start_with?('Emeritus') and return "Already a member:
#{uid}"
already = ASF::MemberFiles.member_nominees
return "Already nominated: #{uid} by #{already[uid]['Nominated by']}" if
already.include? uid
return 'OK'
(whimsy) branch master updated: Accidental commit
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 3081455e Accidental commit
3081455e is described below
commit 3081455e257552b72b514902d944d237546f0d7c
Author: Sebb
AuthorDate: Fri Feb 9 16:43:16 2024 +
Accidental commit
---
www/members/proxy.cgi | 2 --
1 file changed, 2 deletions(-)
diff --git a/www/members/proxy.cgi b/www/members/proxy.cgi
index 56ef2ef0..faa1565c 100755
--- a/www/members/proxy.cgi
+++ b/www/members/proxy.cgi
@@ -163,8 +163,6 @@ def emit_form(cur_mtg_dir, meeting, volunteers, disabled)
$('*[name="proxy"]').change(function() {
$('.btn').prop('disabled', false);
});
-
- $('.combobox').on
}
end
(whimsy) branch master updated: Reformat meeting display text
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 47b9c4e3 Reformat meeting display text
47b9c4e3 is described below
commit 47b9c4e3b8681ad3f8bff522ac27cda82c921c9a
Author: Sebb
AuthorDate: Fri Feb 9 16:03:03 2024 +
Reformat meeting display text
---
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 874d4ea7..56ef2ef0 100755
--- a/www/members/proxy.cgi
+++ b/www/members/proxy.cgi
@@ -12,18 +12,19 @@ require 'whimsy/asf/meeting-util'
# Emit basic instructions and details on quorum
def emit_instructions(today, cur_mtg_dir, meeting)
+ meeting_display = meeting.gsub(%r{\A(\d\d\d\d)(\d\d)(\d\d)\z}, "\\1-\\2-\\3")
if today > meeting
_p.text_warning %{
WARNING: Data for the next Member's Meeting is not yet available,
so this form will not work yet. Please wait until the Board Chair
announces the opening of nominations for the board and new members,
and then check back to assign a new proxy for the meeting.
-Data from the previous meeting on #{meeting} is shown below for
debugging only.
+Data from the previous meeting on #{meeting_display} is shown below
for debugging only.
}
end
_p %{
This form allows you to assign a proxy for the upcoming
-Member's Meeting on #{meeting}. If there is any chance you might not be
able
+Member's Meeting on #{meeting_display}. If there is any chance you might
not be able
to attend the first part of the Member's Meeting on Tuesday in IRC, then
please assign a proxy, because that helps the meeting reach
quorum more quickly - the meeting can't formally continue without quorum
at the start.
@@ -50,7 +51,7 @@ def emit_instructions(today, cur_mtg_dir, meeting)
_p do
_ 'Currently, we must have '
_span.text_primary attend_irc
- _ " Members attend the #{meeting} meeting and respond to Roll Call to
reach quorum and continue the meeting."
+ _ " Members attend the #{meeting_display} meeting and respond to Roll
Call to reach quorum and continue the meeting."
_ " Calculation: Total voting members: #{num_members}, with one third
for quorum: #{quorum_need}, minus previously submitted proxies: #{num_proxies}"
end
end
(whimsy) branch master updated: Drop old code
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 e7ae6eb3 Drop old code
e7ae6eb3 is described below
commit e7ae6eb33c2725195b46c5ecf5e66a5edb889046
Author: Sebb
AuthorDate: Fri Feb 9 15:37:56 2024 +
Drop old code
---
www/members/proxy.cgi | 23 ---
1 file changed, 23 deletions(-)
diff --git a/www/members/proxy.cgi b/www/members/proxy.cgi
index 3a351914..874d4ea7 100755
--- a/www/members/proxy.cgi
+++ b/www/members/proxy.cgi
@@ -21,7 +21,6 @@ def emit_instructions(today, cur_mtg_dir, meeting)
Data from the previous meeting on #{meeting} is shown below for
debugging only.
}
end
- if meeting != '20220615'
_p %{
This form allows you to assign a proxy for the upcoming
Member's Meeting on #{meeting}. If there is any chance you might not be
able
@@ -46,28 +45,6 @@ def emit_instructions(today, cur_mtg_dir, meeting)
_code 'proxies'
_ ' file. The great majority of proxies assigned are for attendance only;
not for voting.'
end
- else
- _p do
-_ "This form allows you to assign a proxy for the upcoming"
-_ "Member's Meeting on #{meeting}. For this meeting, we encourage"
-_strong 'every'
-_ "ASF member to assign a proxy to the ASF Secretary."
-_ "Attendance to the meeting is completely optional, and you can revoke a"
-_ "proxy at any time."
- end
- _p %{
-If you submit a proxy, you will still be sent ballots by email,
-so you will still need to
-cast your votes by checking your mail and clicking the links.
- }
- _p do
-_ 'Note while the legal proxy form below states your proxy may have your
voting rights, in practice '
-_strong 'you will still be emailed your ballots'
-_ ' unless you explicitly mark a \'*\' in the appropriate place in the '
-_code 'proxies'
-_ ' file. The great majority of proxies assigned are for attendance only;
not for voting.'
- end
- end
num_members, quorum_need, num_proxies, attend_irc =
ASF::MeetingUtil.calculate_quorum(cur_mtg_dir)
if num_members
_p do
(whimsy) branch master updated: Fix up relative runbook links
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 a0c5d2ed Fix up relative runbook links
a0c5d2ed is described below
commit a0c5d2ed83626d74a68747d1f2b2b690bdd77117
Author: Sebb
AuthorDate: Fri Feb 9 15:25:13 2024 +
Fix up relative runbook links
---
lib/whimsy/asf/meeting-util.rb | 2 ++
www/members/meeting.cgi| 2 +-
2 files changed, 3 insertions(+), 1 deletion(-)
diff --git a/lib/whimsy/asf/meeting-util.rb b/lib/whimsy/asf/meeting-util.rb
index 067a9282..bf8767b7 100644
--- a/lib/whimsy/asf/meeting-util.rb
+++ b/lib/whimsy/asf/meeting-util.rb
@@ -13,6 +13,8 @@ module ASF
VCAL_EVENTS_FILENAME = 'ASF-members-meeting.ics'
PROXIES_FILENAME = 'proxies'
+# The URL is generated using emit_link() in meeting.cgi
+# if the name includes '/' then use as is unless it starts with 'runbook/'
MEETING_FILES = { # Filename in meeting dir, pathname to another deployed
tool, or URL
'README.txt' => 'README For Meeting Process And Roll Call',
'runbook/email_03_nomination_of_board.txt' => 'How To Nominate Someone
For Board',
diff --git a/www/members/meeting.cgi b/www/members/meeting.cgi
index f0588b09..360b6823 100755
--- a/www/members/meeting.cgi
+++ b/www/members/meeting.cgi
@@ -25,7 +25,7 @@ end
# Utility function for links, Note: cheezy path detection within MEETING_FILES
def emit_link(cur_mtg_dir, f, desc)
- _a desc, href: f.include?('/') ? f : File.join(cur_mtg_dir, f)
+ _a desc, href: f.include?('/') && !f.start_with?('runbook/') ? f :
File.join(cur_mtg_dir, f)
end
# Output action links for meeting records, depending on if current or past
(whimsy) branch master updated: Follow renamed files
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 465f96be Follow renamed files
465f96be is described below
commit 465f96be7ec8d4eaaffa89c3b51c9c99698b7033
Author: Sebb
AuthorDate: Fri Feb 9 15:05:59 2024 +
Follow renamed files
---
lib/whimsy/asf/meeting-util.rb | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/lib/whimsy/asf/meeting-util.rb b/lib/whimsy/asf/meeting-util.rb
index a406d6fb..067a9282 100644
--- a/lib/whimsy/asf/meeting-util.rb
+++ b/lib/whimsy/asf/meeting-util.rb
@@ -15,8 +15,8 @@ module ASF
MEETING_FILES = { # Filename in meeting dir, pathname to another deployed
tool, or URL
'README.txt' => 'README For Meeting Process And Roll Call',
- 'nomination_of_board.txt' => 'How To Nominate Someone For Board',
- 'nomination_of_members.txt' => 'How To Nominate A New Member',
+ 'runbook/email_03_nomination_of_board.txt' => 'How To Nominate Someone
For Board',
+ 'runbook/email_02_nomination_of_members.txt' => 'How To Nominate A New
Member',
'/members/proxy.cgi' => 'How To Submit A Proxy/Check Your Proxies',
'https://www.apache.org/foundation/governance/meetings' => 'How Voting
Via Email Works',
'agenda.txt' => 'Official Meeting Agenda',
