[whimsy] branch master updated: show proposed new chair names (or outgoing, in the case of terminate resolutions)

[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 84ebe51  show proposed new chair names (or outgoing, in the case of terminate resolutions)
84ebe51 is described below

commit 84ebe513159880fb47720e271e1b35e38b22f141
Author: Sam Ruby <ru...@intertwingly.net>
AuthorDate: Mon May 28 11:08:14 2018 -0400

    show proposed new chair names (or outgoing, in the case of terminate resolutions)
---
 lib/whimsy/asf/agenda/special.rb           | 8 ++++++--
 www/board/agenda/views/models/agenda.js.rb | 7 +++++++
 www/board/agenda/views/pages/index.js.rb   | 2 +-
 3 files changed, 14 insertions(+), 3 deletions(-)

diff --git a/lib/whimsy/asf/agenda/special.rb b/lib/whimsy/asf/agenda/special.rb
index 3b1bb29..2cbf7c4 100644
--- a/lib/whimsy/asf/agenda/special.rb
+++ b/lib/whimsy/asf/agenda/special.rb
@@ -98,7 +98,7 @@ class ASF::Board::Agenda
 
         next unless committee.names
         committee.names.each do |id, name|
-          people << [name, id] if text.include? name
+          people << [name, id] if text.include? name or title.include? 'Term'
         end
 
         if people.length < 2 and not title.start_with? 'Terminate'
@@ -106,7 +106,11 @@ class ASF::Board::Agenda
           attrs['names'] = committee.names
         end
 
-        need_chair = true if title =~ /Change (.*?) Chair/
+        if title =~ /Change (.*?) Chair/
+          need_chair = true 
+        else # Terminate
+          attrs['chair'] = committee.chair.id
+        end
 
       elsif title =~ /Establish (.*)/
         name = $1
diff --git a/www/board/agenda/views/models/agenda.js.rb b/www/board/agenda/views/models/agenda.js.rb
index 18c8674..d7d9232 100644
--- a/www/board/agenda/views/models/agenda.js.rb
+++ b/www/board/agenda/views/models/agenda.js.rb
@@ -187,6 +187,13 @@ class Agenda
       @notes.sub(/^.*missing/, '').split(',').length >= 2
   end
 
+  # extract (new) chair name from resolutions
+  def chair_name
+    if @chair
+      @people[@chair].name
+    end
+  end
+
   # compute href by taking the title and replacing all non alphanumeric
   # characters with dashes
   def href
diff --git a/www/board/agenda/views/pages/index.js.rb b/www/board/agenda/views/pages/index.js.rb
index e28b3fa..e76ee0d 100644
--- a/www/board/agenda/views/pages/index.js.rb
+++ b/www/board/agenda/views/pages/index.js.rb
@@ -28,7 +28,7 @@ class Index < Vue
             _td { _Link text: row.title, href: row.href }
           end
 
-          _td row.owner
+          _td row.owner || row.chair_name
           _td do
             if row.shepherd
               _Link text: row.shepherd,

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