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 8d4a1f2 fix https://issues.apache.org/jira/browse/WHIMSY-125 8d4a1f2 is described below commit 8d4a1f2ae28abea24d47703a217eda033ff05ff3 Author: Sam Ruby <ru...@intertwingly.net> AuthorDate: Sat Aug 12 09:20:45 2017 -0400 fix https://issues.apache.org/jira/browse/WHIMSY-125 --- www/roster/models/committer.rb | 23 ++++++++++------------- 1 file changed, 10 insertions(+), 13 deletions(-) diff --git a/www/roster/models/committer.rb b/www/roster/models/committer.rb index 35c72e2..9c4027f 100644 --- a/www/roster/models/committer.rb +++ b/www/roster/models/committer.rb @@ -57,31 +57,27 @@ class Committer response[:committees] = person.committees.map(&:name) - response[:podlings] = - (person.projects.map(&:name) & ASF::Podling.current.map(&:id)).sort - response[:groups] = person.services response[:committer] = [] + response[:podlings] = [] committees = ASF::Committee.pmcs.map(&:name) + podlings = ASF::Podling.current.map(&:id) person.groups.map(&:name).each do |group| - if committees.include? group - unless response[:committees].include? group - # Legacy LDAP unix group - response[:committer] << group - end - else + unless committees.include? group response[:groups] << group end end # Get project(member) details - person.projects.select{|prj| prj.members.include? person}.map(&:name).each do |group| - if committees.include? group + person.projects.map(&:name).each do |project| + if committees.include? project # Don't show committer karma if person has committee karma - unless response[:committees].include? group + unless response[:committees].include? project # LDAP project group - response[:committer] << group + response[:committer] << project end + elsif podlings.include? project + response[:podlings] << project else # TODO should this populate anything? end @@ -98,6 +94,7 @@ class Committer response[:committees].sort! response[:groups].sort! response[:committer].sort! + response[:podlings].sort! if ASF::Person.find(env.user).asf_member? response[:forms] = {} -- To stop receiving notification emails like this one, please contact ['"commits@whimsical.apache.org" <commits@whimsical.apache.org>'].