whimsical-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From curc...@apache.org
Subject [whimsy] branch master updated: Fixup pathing for server vs. svn files
Date Thu, 06 Feb 2020 13:26:14 GMT
This is an automated email from the ASF dual-hosted git repository.

curcuru 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 fe66ad8  Fixup pathing for server vs. svn files
fe66ad8 is described below

commit fe66ad80fa483d4aea88241a61c29e1ae094c8a1
Author: Shane Curcuru <asf@shanecurcuru.org>
AuthorDate: Thu Feb 6 08:25:59 2020 -0500

    Fixup pathing for server vs. svn files
---
 www/members/meeting-util.rb |  2 +-
 www/members/meeting.cgi     | 15 ++++++++-------
 2 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/www/members/meeting-util.rb b/www/members/meeting-util.rb
index cc87490..d03844f 100644
--- a/www/members/meeting-util.rb
+++ b/www/members/meeting-util.rb
@@ -4,7 +4,7 @@ require 'json'
 
 class MeetingUtil
   RECORDS = 'https://svn.apache.org/repos/private/foundation/Meetings'
-  MEETING_FILES = { # Filename in meeting dir, or pathname to another tool
+  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',
diff --git a/www/members/meeting.cgi b/www/members/meeting.cgi
index 1774871..d0a63a0 100755
--- a/www/members/meeting.cgi
+++ b/www/members/meeting.cgi
@@ -29,7 +29,7 @@ def emit_link(cur_mtg_dir, f, desc)
 end
 
 # Output action links for meeting records, depending on if current or past
-def emit_meeting(cur_mtg_dir, dt)
+def emit_meeting(cur_mtg_dir, svn_mtg_dir, dt)
   _div id: "meeting-#{dt.year}"
   _whimsy_panel("All Meeting Details for #{dt.strftime(DTFORMAT)}", style: 'panel-info')
do 
     if Date.today > dt
@@ -51,7 +51,7 @@ def emit_meeting(cur_mtg_dir, dt)
     _ul do
       MeetingUtil::MEETING_FILES.each do |f, desc|
         _li do
-          emit_link(cur_mtg_dir, f, desc)
+          emit_link(svn_mtg_dir, f, desc)
         end
       end
     end
@@ -64,6 +64,7 @@ _html do
     MEETINGS = ASF::SVN['Meetings']
     cur_mtg_dir = MeetingUtil.get_latest(MEETINGS).untaint
     meeting = File.basename(cur_mtg_dir)
+    svn_mtg_dir = File.join(MeetingUtil::RECORDS, meeting)
     mtg_date = Date.parse(meeting)
     today = Date.today
     # Use ics files for accurate times; see create-meeting.rb
@@ -153,7 +154,7 @@ _html do
           _ul do
             ['nomination_of_board.txt', 'nomination_of_members.txt', '/members/proxy.cgi'].each
do |f|
               _li do
-                emit_link(cur_mtg_dir, f, MeetingUtil::MEETING_FILES[f])
+                emit_link(svn_mtg_dir, f, MeetingUtil::MEETING_FILES[f])
               end
             end
           end
@@ -170,7 +171,7 @@ _html do
           _ul do
             ['nominated-members.txt', '/members/proxy.cgi'].each do |f|
               _li do
-                emit_link(cur_mtg_dir, f, MeetingUtil::MEETING_FILES[f])
+                emit_link(svn_mtg_dir, f, MeetingUtil::MEETING_FILES[f])
               end
             end
           end
@@ -189,7 +190,7 @@ _html do
           _ul do
             ['agenda.txt', 'README.txt', 'https://www.apache.org/foundation/governance/meetings'].each
do |f|
               _li do
-                emit_link(cur_mtg_dir, f, MeetingUtil::MEETING_FILES[f])
+                emit_link(svn_mtg_dir, f, MeetingUtil::MEETING_FILES[f])
               end
             end
           end
@@ -219,7 +220,7 @@ _html do
           _ul do
             ['record', 'attend', 'voter-tally', 'raw_board_votes.txt'].each do |f|
               _li do
-                emit_link(cur_mtg_dir, f, MeetingUtil::MEETING_FILES[f])
+                emit_link(svn_mtg_dir, f, MeetingUtil::MEETING_FILES[f])
               end
             end
           end
@@ -243,7 +244,7 @@ _html do
       end
       
       # Most/all of these links should already be included above
-      emit_meeting(cur_mtg_dir, m1_date)
+      emit_meeting(cur_mtg_dir, svn_mtg_dir, m1_date)
       
       _div id: "meeting-history"
       _whimsy_panel("Member Meeting History", style: 'panel-info') do


Mime
View raw message