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 <s...@apache.org>
AuthorDate: Fri Feb 9 15:25:13 2024 +0000
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
