whimsical-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ru...@apache.org
Subject [whimsy] branch master updated: include minutes not yet drafted
Date Mon, 09 Oct 2017 19:30:51 GMT
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


The following commit(s) were added to refs/heads/master by this push:
     new 20d67a4  include minutes not yet drafted
20d67a4 is described below

commit 20d67a41e210cbf61c87f547759e8ddd0fdd959e
Author: Sam Ruby <rubys@intertwingly.net>
AuthorDate: Mon Oct 9 15:30:41 2017 -0400

    include minutes not yet drafted
---
 www/board/agenda/routes.rb | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/www/board/agenda/routes.rb b/www/board/agenda/routes.rb
index 8d88f10..4d37b9f 100755
--- a/www/board/agenda/routes.rb
+++ b/www/board/agenda/routes.rb
@@ -361,12 +361,10 @@ get '/new' do
 
   # Get list of unpublished and unapproved minutes
   draft = YAML.load_file(Dir["#{AGENDA_WORK}/board_minutes*.yml"].sort.last)
-  @minutes = dir("board_minutes_*.txt").
+  @minutes = dir("board_agenda_*.txt").
     map {|file| Date.parse(file[/\d[_\d]+/].gsub('_', '-'))}.
-    select {|date| draft[date.strftime('%B %d, %Y')] != 'approved'}
-
-  @disabled = dir("board_agenda_*.txt").
-    include? @meeting.strftime("board_agenda_%Y_%m_%d.txt")
+    reject {|date| date >= @meeting.to_date}.
+    reject {|date| draft[date.strftime('%B %d, %Y')] == 'approved'}
 
   template = File.read('data/agenda.erb')
   @agenda = Erubis::Eruby.new(template).result(binding)

-- 
To stop receiving notification emails like this one, please contact
['"commits@whimsical.apache.org" <commits@whimsical.apache.org>'].

Mime
View raw message