[whimsy] branch master updated: Add paragraph info to output

[se...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

sebb 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 894f39e  Add paragraph info to output
894f39e is described below

commit 894f39e9d3a81a9ad03b00200692174930d77400
Author: Sebb <se...@apache.org>
AuthorDate: Mon Oct 7 00:24:30 2019 +0100

    Add paragraph info to output
---
 www/roster/public_committee_info.rb | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/www/roster/public_committee_info.rb b/www/roster/public_committee_info.rb
index 9871119..798a7ef 100644
--- a/www/roster/public_committee_info.rb
+++ b/www/roster/public_committee_info.rb
@@ -41,8 +41,7 @@ info = {last_updated: ASF::Committee.svn_change}
 info[:committees] = Hash[committees.map {|committee|
   schedule = committee.schedule.to_s.split(/,\s*/)
   schedule.unshift committee.report if committee.report != committee.schedule
-
-  [committee.name.gsub(/[^-\w]/,''), {
+  data = {
     display_name: committee.display_name,
     site: committee.site,
     description: committee.description,
@@ -55,7 +54,9 @@ info[:committees] = Hash[committees.map {|committee|
       [chair[:id], {:name => chair[:name]} ]}],
     roster: committee.roster.sort.to_h, # sort entries by uid
     pmc: committee.pmc?
-  }]
+  }
+  data[:paragraph] = committee.paragraph if committee.paragraph
+  [committee.name.gsub(/[^-\w]/,''), data]
 }]
 
 info[:officers] = Hash[
@@ -63,6 +64,7 @@ info[:officers] = Hash[
     [officer.name, 
       {
         display_name: officer.display_name,
+        paragraph: officer.paragraph, # will always be present
         roster: Hash[ officer.chairs.map {|e| [e[:id], {:name => e[:name]}]}]
       }
     ]