This is an automated email from the ASF dual-hosted git repository. rubys pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/whimsy.git
commit 44b59d52ad74621530656661c86c015cb6bc4945 Author: Sam Ruby <[email protected]> AuthorDate: Sun Apr 12 08:25:35 2020 -0400 Fix WHIMSY-324 --- www/board/agenda/routes.rb | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/www/board/agenda/routes.rb b/www/board/agenda/routes.rb index 8a93bbc..f7d17a8 100755 --- a/www/board/agenda/routes.rb +++ b/www/board/agenda/routes.rb @@ -83,14 +83,14 @@ get '/missing' do # update in memory cache with a dummy agenda. The only relevant # part of the agenda that matters for this operation is the list # of pmcs (@pmcs). - template = File.read('templates/agenda.erb') + template = "#{ASF::SVN['foundation_board']}/board_agenda_template.erb" @meeting = ASF::Board.nextMeeting agenda = @meeting.strftime('board_agenda_%Y_%m_%d.txt') @directors = ['TBD'] @minutes = [] @owner = ASF::Board::ShepherdStream.new @pmcs = ASF::Board.reporting(@meeting) - contents = Erubis::Eruby.new(template).result(binding) + contents = Erubis::Eruby.new(IO.read(template)).result(binding) Agenda.update_cache(agenda, nil, contents, true) end @@ -546,10 +546,10 @@ get '/new' do reject {|date| draft[date.strftime('%B %d, %Y')] == 'approved'}. sort - template = File.read('templates/agenda.erb') + template = "#{ASF::SVN['foundation_board']}/board_agenda_template.erb" @disabled = dir("board_agenda_*.txt"). include? @meeting.strftime("board_agenda_%Y_%m_%d.txt") - @agenda = Erubis::Eruby.new(template).result(binding) + @agenda = Erubis::Eruby.new(IO.read(template)).result(binding) @cssmtime = File.mtime('public/stylesheets/app.css').to_i _html :new
