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: only include podlings in list
Date Tue, 06 Jun 2017 18:13:59 GMT
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 47b913e  only include podlings in list
47b913e is described below

commit 47b913e679ac5a4f98058b4c8f3beb2f2d49b65c
Author: Sam Ruby <rubys@intertwingly.net>
AuthorDate: Tue Jun 6 14:13:44 2017 -0400

    only include podlings in list
---
 lib/whimsy/asf/podlings.rb     | 4 ++++
 www/roster/models/committer.rb | 3 ++-
 www/roster/views/person.js.rb  | 6 +++---
 3 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/lib/whimsy/asf/podlings.rb b/lib/whimsy/asf/podlings.rb
index 17e1941..93d0485 100644
--- a/lib/whimsy/asf/podlings.rb
+++ b/lib/whimsy/asf/podlings.rb
@@ -118,6 +118,10 @@ module ASF
       @list
     end
 
+    def self.current
+      list.select {|podling| podling.status == 'current'}
+    end
+
     def self.mtime
       @mtime
     end
diff --git a/www/roster/models/committer.rb b/www/roster/models/committer.rb
index 834a143..9bf915b 100644
--- a/www/roster/models/committer.rb
+++ b/www/roster/models/committer.rb
@@ -51,7 +51,8 @@ class Committer
 
     response[:committees] = person.committees.map(&:name)
 
-    response[:projects] = person.projects.map(&:name).sort
+    response[:podlings] = 
+      (person.projects.map(&:name) & ASF::Podling.current.map(&:id)).sort
 
     response[:groups] = person.services
     response[:committer] = []
diff --git a/www/roster/views/person.js.rb b/www/roster/views/person.js.rb
index 7901d9b..d7d91ef 100644
--- a/www/roster/views/person.js.rb
+++ b/www/roster/views/person.js.rb
@@ -68,12 +68,12 @@ class Person < React
     end
 
     # Podlings
-    unless @committer.projects.empty?
+    unless @committer.podlings.empty?
       _div.row do
 	_div.name 'Podlings'
 	_div.value do
-	  _ul @committer.projects do |project|
-	    _li {_a project, href: "ppmc/#{project}"}
+	  _ul @committer.podlings do |podlings|
+	    _li {_a podlings, href: "ppmc/#{podlings}"}
 	  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