[whimsy] branch master updated: Fix incorrect use of members (committers)

[sebb]

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 edca993  Fix incorrect use of members (committers)
edca993 is described below

commit edca993eef33a3144c6cb4e74c3522d1a591293f
Author: Sebb <s...@apache.org>
AuthorDate: Thu Feb 28 18:57:33 2019 +0000

    Fix incorrect use of members (committers)
---
 www/roster/models/ppmc.rb | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/www/roster/models/ppmc.rb b/www/roster/models/ppmc.rb
index 400a4e4..2d81202 100644
--- a/www/roster/models/ppmc.rb
+++ b/www/roster/models/ppmc.rb
@@ -9,7 +9,7 @@ class PPMC
       list =~ /^(incubator-)?#{ppmc.mail_list}\b/
     end
 
-    members = ppmc.members
+    committers = ppmc.members
 
     # separate out the known ASF members and extract any matching committer 
details
     unknownSubs = []
@@ -25,7 +25,7 @@ class PPMC
     unMatchedSubs = [] # unknown private@ subscribers
     currentUser = ASF::Person.find(env.user)
     analysePrivateSubs = false # whether to show missing private@ subscriptions
-    if currentUser.asf_member? or members.include? currentUser
+    if currentUser.asf_member? or owners.include? currentUser
       require 'whimsy/asf/mlist'
       moderators, modtime = ASF::MLIST.list_moderators(ppmc.mail_list, true)
       subscribers, subtime = ASF::MLIST.list_subscribers(ppmc.mail_list, true) 
# counts only
@@ -51,7 +51,7 @@ class PPMC
     incubator_committers = pmc.committers
     owners = ppmc.owners
 
-    roster = members.map {|person|
+    roster = owners.map {|person|
       notSubbed = false
       if analysePrivateSubs and owners.include? person
         allMail = person.all_mail.map{|m| m.downcase}
@@ -128,7 +128,7 @@ class PPMC
       mentors: ppmc.mentors,
       hasLDAP: ppmc.hasLDAP?,
       owners: owners.map {|person| person.id},
-      committers: members.map {|person| person.id},
+      committers: committers.map {|person| person.id},
       roster: roster,
       mail: Hash[lists.sort],
       moderators: moderators,