diff --git a/asf.gemspec b/asf.gemspec index e96c392d1f..fb68567625 100644 --- a/asf.gemspec +++ b/asf.gemspec @@ -25,6 +25,7 @@ Gem::Specification.new do |s| s.add_dependency("rack") s.add_dependency("ruby-ldap") s.add_dependency("tzinfo") + s.add_dependency("tzinfo-data") s.add_dependency("wunderbar") # If your tests use any gems, include them here diff --git a/asf.version b/asf.version index 7c1886bb9f..8cbf02c396 100644 --- a/asf.version +++ b/asf.version @@ -1 +1 @@ -0.0.10 +0.0.12 diff --git a/lib/whimsy/asf/agenda.rb b/lib/whimsy/asf/agenda.rb index 365887e60e..0dfbd304f6 100644 --- a/lib/whimsy/asf/agenda.rb +++ b/lib/whimsy/asf/agenda.rb @@ -89,13 +89,17 @@ def parse(file, quick=false) # add roster and prior report link whimsy = 'https://whimsy.apache.org' @sections.each do |section, hash| - next unless section =~ /^(4[A-Z]|\d+|[A-Z][A-Z]?)$/ - committee = ASF::Committee.find(hash['title'] ||= 'UNKNOWN') - unless section =~ /^4[A-Z]$/ - hash['roster'] = - "#{whimsy}/roster/committee/#{CGI.escape committee.name}" - end - hash['prior_reports'] = minutes(committee.display_name) + next unless section =~ /^(4[A-Z]|\d+|[A-Z][A-Z]?)$/ + committee = ASF::Committee.find(hash['title'] ||= 'UNKNOWN') + unless section =~ /^4[A-Z]$/ + hash['roster'] = + "#{whimsy}/roster/committee/#{CGI.escape committee.name}" + end + if section =~ /^[A-Z][A-Z]?$/ + hash['stats'] = + "https://reporter.apache.org/?#{CGI.escape committee.name}" + end + hash['prior_reports'] = minutes(committee.display_name) end end diff --git a/lib/whimsy/asf/agenda/special.rb b/lib/whimsy/asf/agenda/special.rb index f93ed1b04e..ee25d5f5f3 100644 --- a/lib/whimsy/asf/agenda/special.rb +++ b/lib/whimsy/asf/agenda/special.rb @@ -60,6 +60,8 @@ class ASF::Board::Agenda committee = ASF::Committee.find($1) attrs['roster'] = "#{whimsy}/roster/committee/#{CGI.escape committee.name}" + attrs['stats'] = + "https://reporter.apache.org/?#{CGI.escape committee.name}" attrs['prior_reports'] = minutes(committee.display_name) name1 = text[/heretofore\sappointed\s(\w.*)\sto/,1] sname1 = name1.to_s.downcase.gsub('.', ' ').split(/\s+/) diff --git a/www/board/agenda/views/main._html b/www/board/agenda/views/main._html index f69cdf79d6..d680ee2206 100755 --- a/www/board/agenda/views/main._html +++ b/www/board/agenda/views/main._html @@ -39,13 +39,16 @@ _html ng_app: 'AsfBoardAgenda', ng_controller: 'Layout' do _dt 'Approved', ng_show: 'item.approved' _dd '{{ item.approved && item.approved.join(", ") }}', ng_show: 'item.approved' - _dt 'Links', ng_show: 'item.roster || item.prior_reports' + _dt 'Links', ng_show: 'item.roster||item.prior_reports||item.stats' _dd ng_show: 'item.roster' do _a 'Roster', href: '{{ item.roster }}' end _dd ng_show: 'item.prior_reports' do _a 'Prior Reports', ng_href: '{{ item.prior_reports }}' end + _dd ng_show: 'item.stats' do + _a 'Statistics', ng_href: '{{ item.stats }}' + end end end