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 736599f1 Shorhand for getting Meeting svn path
736599f1 is described below
commit 736599f1b3e597f59dab6f1d20438be36b9748e5
Author: Sebb <[email protected]>
AuthorDate: Sun Feb 22 14:58:27 2026 +0000
Shorhand for getting Meeting svn path
---
lib/whimsy/asf/meeting-util.rb | 11 +++++++++++
www/members/check_boardnoms.cgi | 3 +--
www/members/check_membernoms.cgi | 3 +--
3 files changed, 13 insertions(+), 4 deletions(-)
diff --git a/lib/whimsy/asf/meeting-util.rb b/lib/whimsy/asf/meeting-util.rb
index 3aa1bcdd..766a79f9 100644
--- a/lib/whimsy/asf/meeting-util.rb
+++ b/lib/whimsy/asf/meeting-util.rb
@@ -166,6 +166,17 @@ module ASF
return Dir[File.join(mtg_root, '2*')].max
end
+ # Get the latest available Meetings date (yyyymmdd)
+ def self.get_latest_date
+ return File.basename(get_latest(MEETINGS_DIR))
+ end
+
+ # Get the latest available Meetings SVN path
+ # args - optional relative path components to be added to the base
+ def self.get_latest_svnpath(*args)
+ ASF::SVN.svnpath!('Meetings', get_latest_date, *args)
+ end
+
# Get the second latest available Meetings dir
def self.get_previous(mtg_root)
return Dir[File.join(mtg_root, '2*')].sort[-2]
diff --git a/www/members/check_boardnoms.cgi b/www/members/check_boardnoms.cgi
index 5b1bffdb..447d04bc 100755
--- a/www/members/check_boardnoms.cgi
+++ b/www/members/check_boardnoms.cgi
@@ -121,13 +121,12 @@ _html do
_h3 "Nominations close in #{ASFTime.secs2text(t_end - t_now)} at
#{Time.at(t_end).utc} for Meeting: #{timelines['meeting_iso']}"
_p 'Please ensure all posted nominations are added to
board_nominations.txt before then.'
end
- cur_mtg_dir = File.basename(ASF::MeetingUtil.get_latest(MEETINGS))
nominations, emails = setup_data
_div.flexbox do
_div.flexitem do
_h1_! do
_ 'Nominees in '
- _a 'svn', href: ASF::SVN.svnpath!('Meetings', cur_mtg_dir,
'board_nominations.txt')
+ _a 'svn', href:
ASF::MeetingUtil.get_latest_svnpath(ASF::MemberFiles::NOMINATED_BOARD)
end
_p.count "Count: #{nominations.count}"
diff --git a/www/members/check_membernoms.cgi b/www/members/check_membernoms.cgi
index 054fadf6..a6881334 100755
--- a/www/members/check_membernoms.cgi
+++ b/www/members/check_membernoms.cgi
@@ -144,14 +144,13 @@ _html do
_h3 "Nominations close in #{ASFTime.secs2text(t_end - t_now)} at
#{Time.at(t_end).utc} for Meeting: #{timelines['meeting_iso']}"
_p 'Please ensure all posted nominations are added to
nominated-members.txt before then.'
end
- cur_mtg_dir = File.basename(ASF::MeetingUtil.get_latest(MEETINGS))
nominations, emails = setup_data
_div.flexbox do
_div.flexitem do
_h1_! do
_a 'Nominees', href: 'watch/nominees'
_ ' in '
- _a 'svn', href: ASF::SVN.svnpath!('Meetings', cur_mtg_dir,
'nominated-members.txt')
+ _a 'svn', href:
ASF::MeetingUtil.get_latest_svnpath(ASF::MemberFiles::NOMINATED_MEMBERS)
end
_p.count "Count: #{nominations.count}"