whimsical-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ru...@apache.org
Subject [whimsy] branch master updated: podlings: add mentors and members
Date Sun, 15 Jan 2017 18:45:24 GMT
This is an automated email from the ASF dual-hosted git repository.

rubys pushed a commit to branch master
in repository https://git-dual.apache.org/repos/asf/whimsy.git

The following commit(s) were added to refs/heads/master by this push:
       new  3fc3ccf   podlings: add mentors and members
3fc3ccf is described below

commit 3fc3ccfa665192e7a18c50c0e5261ca1511bd951
Author: Sam Ruby <rubys@intertwingly.net>
AuthorDate: Sun Jan 15 13:45:04 2017 -0500

    podlings: add mentors and members
---
 www/roster/models/ppmc.rb           |  3 ++-
 www/roster/views/ppmc/members.js.rb | 20 +++++++++-----------
 2 files changed, 11 insertions(+), 12 deletions(-)

diff --git a/www/roster/models/ppmc.rb b/www/roster/models/ppmc.rb
index 7b8fd8c..534a278 100644
--- a/www/roster/models/ppmc.rb
+++ b/www/roster/models/ppmc.rb
@@ -10,8 +10,9 @@ class PPMC
       description: ppmc.description,
       schedule: ppmc.reporting,
       established: ppmc.startdate,
+      mentors: ppmc.mentors,
       roster: ppmc.members.map {|person|
-        [person.id, {name: person.public_name}]
+        [person.id, {name: person.public_name, member: person.asf_member?}]
       }.to_h,
     }
 
diff --git a/www/roster/views/ppmc/members.js.rb b/www/roster/views/ppmc/members.js.rb
index 8abf671..51017d2 100644
--- a/www/roster/views/ppmc/members.js.rb
+++ b/www/roster/views/ppmc/members.js.rb
@@ -15,6 +15,7 @@ class PPMCMembers < React
         _tr do
           _th 'id'
           _th 'public name'
+          _th 'notes'
         end
       end
 
@@ -53,15 +54,6 @@ class PPMCMembers < React
       roster << person
     end
 
-    for id in @@ppmc.ldap
-      person = @@ppmc.roster[id]
-      if person
-        person.ldap = true
-      else
-        roster << {id: id, name: @@ppmc.ldap[id], ldap: true}
-      end
-    end
-
     @roster = roster.sort_by {|person| person.name}
   end
 
@@ -92,13 +84,19 @@ class PPMCMember < React
   def render
     _tr onDoubleClick: self.select do
 
-      if false # @@ppmc.asfmembers.include? @@person.id
-        _td { _b @@person.name }
+      if @@person.member
         _td { _b { _a @@person.id, href: "committer/#{@@person.id}" } }
+        _td { _b @@person.name }
       else
         _td { _a @@person.id, href: "committer/#{@@person.id}" }
         _td @@person.name
       end
+        
+      if @@ppmc.mentors.include? @@person.id
+        _td 'mentor'
+      else
+        _td
+      end
     end
   end
 

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

Mime
View raw message