[whimsy] 01/02: make how ASF members are handled more consistent

[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

commit 220aca0074c7dcb4749af233e4a6ec86d1f1ebaa
Author: Sam Ruby <ru...@intertwingly.net>
AuthorDate: Fri Sep 8 10:14:30 2017 -0400

    make how ASF members are handled more consistent
---
 www/roster/models/committee.rb        | 16 +++++++++++-----
 www/roster/views/pmc/committers.js.rb |  2 +-
 www/roster/views/pmc/pmc.js.rb        |  2 +-
 www/roster/views/pmc/roster.js.rb     |  2 +-
 4 files changed, 14 insertions(+), 8 deletions(-)

diff --git a/www/roster/models/committee.rb b/www/roster/models/committee.rb
index 335e949..8abd75e 100644
--- a/www/roster/models/committee.rb
+++ b/www/roster/models/committee.rb
@@ -30,18 +30,25 @@ class Committee
     end
 
     roster = pmc.roster.dup
-    roster.each {|key, info| info['role'] = 'PMC member'}
+    roster.each {|key, info| info[:role] = 'PMC member'}
 
     members.each do |person|
-      roster[person.id] ||= {name: person.public_name, role: 'PMC member'}
+      roster[person.id] ||= {
+        name: person.public_name, 
+        role: 'PMC member'
+      }
       roster[person.id]['ldap'] = true
     end
 
     committers.each do |person|
-      roster[person.id] ||= {name: person.public_name}
-      roster[person.id]['role'] ||= 'Committer'
+      roster[person.id] ||= {
+        name: person.public_name,
+        role: 'Committer'
+      }
     end
 
+    roster.each {|id, info| info[:member] = ASF::Person.find(id).asf_member?}
+
     roster[pmc.chair.id]['role'] = 'PMC chair' if pmc.chair
 
     response = {
@@ -56,7 +63,6 @@ class Committee
       ldap: members.map(&:id),
       members: pmc.roster.keys,
       committers: committers.map(&:id),
-      asfmembers: (ASF.members & people).map(&:id),
       roster: roster,
       mail: Hash[lists.sort],
       moderators: moderators,
diff --git a/www/roster/views/pmc/committers.js.rb b/www/roster/views/pmc/committers.js.rb
index 90d4c35..7a7468d 100644
--- a/www/roster/views/pmc/committers.js.rb
+++ b/www/roster/views/pmc/committers.js.rb
@@ -63,7 +63,7 @@ class PMCCommitter < Vue
         end
       end
 
-      if @@committee.asfmembers.include? @@person.id
+      if @@person.member
         _td { _b { _a @@person.id, href: "committer/#{@@person.id}"} }
         _td { _b @@person.name }
       else
diff --git a/www/roster/views/pmc/pmc.js.rb b/www/roster/views/pmc/pmc.js.rb
index a3885a2..beaaa69 100644
--- a/www/roster/views/pmc/pmc.js.rb
+++ b/www/roster/views/pmc/pmc.js.rb
@@ -61,7 +61,7 @@ class PMCMember < Vue
         end
       end
 
-      if @@committee.asfmembers.include? @@person.id
+      if @@person.member
         _td { _b { _a @@person.id, href: "committer/#{@@person.id}" } }
         _td { _b @@person.name }
       else
diff --git a/www/roster/views/pmc/roster.js.rb b/www/roster/views/pmc/roster.js.rb
index 610e6c4..36a6381 100644
--- a/www/roster/views/pmc/roster.js.rb
+++ b/www/roster/views/pmc/roster.js.rb
@@ -46,7 +46,7 @@ class PMCRoster < Vue
               end
             end
 
-            if @@committee.asfmembers.include? person.id
+            if person.member
               _td { _b { _a person.id, href: "committer/#{person.id}" } }
               _td { _b person.name }
             else

-- 
To stop receiving notification emails like this one, please contact
"commits@whimsical.apache.org" <co...@whimsical.apache.org>.