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 821ef82 user.committees does not include podlings
821ef82 is described below
commit 821ef82c828921696a05830bd862235eb3a1c987
Author: Sebb <[email protected]>
AuthorDate: Mon Jul 2 18:44:21 2018 +0100
user.committees does not include podlings
---
www/project/icla/main.rb | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/www/project/icla/main.rb b/www/project/icla/main.rb
index 3b26efd..62e9595 100755
--- a/www/project/icla/main.rb
+++ b/www/project/icla/main.rb
@@ -20,6 +20,7 @@ helpers do
def projectsForUser(userName)
user = ASF::Person.find(userName)
committees = user.committees.map(&:name)
+ project_owners = user.project_owners.map(&:name) # includes podlings and
GUINEA_PIGS
# allData is a hash where the key is the name of the PMC/PPMC and
# the value is a hash of the data for the PMC/PPMC
@@ -29,7 +30,7 @@ helpers do
map{|p| [p.name, {pmc: true, display_name: p.display_name, mail_list:
p.mail_list}]}.to_h # convert to hash of data items
ppmcData =
ASF::Podling.list.select {|podling| podling.status == 'current'}. # get
the podlings
- select {|p| committees.include?('incubator') ||
committees.include?(p.name)}. # keep the ones relevant to the user
+ select {|p| committees.include?('incubator') ||
project_owners.include?(p.name)}. # keep the ones relevant to the user
sort_by{|p| p.name}.
map{|p| [p.name, {pmc: false, display_name: p.display_name, mail_list:
p.mail_list}]}.to_h # convert to hash of data items
pmcData.merge(ppmcData)
