[whimsy] branch master updated: post-post-meeting actions

[ru...@apache.org]

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 b7d68af  post-post-meeting actions
b7d68af is described below

commit b7d68af5ad46cdf061fec5273e9fdee87c5417cb
Author: Sam Ruby <ru...@intertwingly.net>
AuthorDate: Sat Mar 24 15:23:44 2018 -0400

    post-post-meeting actions
    
    Don't show outgoing chairs as needing removal this month
    Do show a list ot terminated pmc actions that are complete
    Don't blow up when showing a committee with no identified chair
---
 www/board/agenda/views/actions/todos.json.rb   | 6 +++---
 www/board/agenda/views/pages/adjournment.js.rb | 8 ++++++++
 www/roster/models/committee.rb                 | 4 +++-
 3 files changed, 14 insertions(+), 4 deletions(-)

diff --git a/www/board/agenda/views/actions/todos.json.rb b/www/board/agenda/views/actions/todos.json.rb
index d943d6a..b1cebf5 100644
--- a/www/board/agenda/views/actions/todos.json.rb
+++ b/www/board/agenda/views/actions/todos.json.rb
@@ -242,16 +242,16 @@ parsed_agenda.each do |item|
   next unless item[:attach] =~ /^7\w$/
   if item['title'] =~ /^Change (.*?) Chair$/ and item['people']
     pmc = ASF::Committee.find($1).id
-    next if Array(minutes[:todos][:changed]).include? pmc
-    change << {name: pmc, resolution: item['title'], chair: item['chair']}
     item['people'].keys.each do |person|
       transitioning[ASF::Person.find(person)] = item['title']
     end
+    next if Array(minutes[:todos][:changed]).include? pmc
+    change << {name: pmc, resolution: item['title'], chair: item['chair']}
   elsif item['title'] =~ /^Establish\s*(.*?)\s*$/ and item['chair']
     pmc = ASF::Committee.find($1).id
+    transitioning[ASF::Person.find(item['chair'])] = item['title']
     next if Array(minutes[:todos][:established]).include? pmc
     establish << {name: pmc, resolution: item['title'], chair: item['chair']}
-    transitioning[ASF::Person.find(item['chair'])] = item['title']
   elsif item['title'] =~ /^Terminate\s*(.*?)\s*$/
     pmc = ASF::Committee.find($1).id
     next if Array(minutes[:todos][:terminated]).include? pmc
diff --git a/www/board/agenda/views/pages/adjournment.js.rb b/www/board/agenda/views/pages/adjournment.js.rb
index 39d5f8d..69f9e4f 100644
--- a/www/board/agenda/views/pages/adjournment.js.rb
+++ b/www/board/agenda/views/pages/adjournment.js.rb
@@ -114,6 +114,14 @@ class Adjournment < Vue
             end
           end
 
+          if completed.terminated and not completed.terminated.empty?
+            _p 'Terminated PMCs'
+            _ul completed.terminated do |pmc|
+              _li {_a pmc.name.downcase(), 
+                 href: "../../../roster/committee/#{pmc.name.downcase()}"}
+            end
+          end
+
           if completed.feedback_sent and not completed.feedback_sent.empty?
             _p 'Sent feedback'
             _ul completed.feedback_sent do |pmc|
diff --git a/www/roster/models/committee.rb b/www/roster/models/committee.rb
index bfa1af7..3beef49 100644
--- a/www/roster/models/committee.rb
+++ b/www/roster/models/committee.rb
@@ -69,7 +69,9 @@ class Committee
 
     roster.each {|id, info| info[:member] = ASF::Person.find(id).asf_member?}
 
-    roster[pmc.chair.id]['role'] = 'PMC chair' if pmc.chair
+    if pmc.chair and roster[pmc.chair.id]
+      roster[pmc.chair.id]['role'] = 'PMC chair' 
+    end
 
     # separate out the known ASF members and extract any matching committer details
     unknownSubs = []

-- 
To stop receiving notification emails like this one, please contact
rubys@apache.org.