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 efb29818 More detail on podling affiliation
efb29818 is described below
commit efb2981853bc9ff309b6bf0307fbec1d05e7d518
Author: Sebb <[email protected]>
AuthorDate: Mon Jul 14 16:34:55 2025 +0100
More detail on podling affiliation
---
www/roster/models/committer.rb | 21 +++++++++++++++------
www/roster/views/person/main.js.rb | 26 +++++++++++++++++++++-----
2 files changed, 36 insertions(+), 11 deletions(-)
diff --git a/www/roster/models/committer.rb b/www/roster/models/committer.rb
index e936c994..d7fdc664 100644
--- a/www/roster/models/committer.rb
+++ b/www/roster/models/committer.rb
@@ -78,10 +78,12 @@ class Committer
response[:groups] = person.services
response[:committer] = [] # PMC committers
response[:committees] = [] # PMC owners
- response[:podlings] = [] # podling owner or committer
+ response[:podlings] = [] # podling owner or committer (deprecated)
+ response[:podling_owner] = [] # PPMC member
+ response[:podling_member] = [] # PPMC committer
pmcs = ASF::Committee.pmcs
pmc_names = pmcs.map(&:name) # From CI
- podlings = ASF::Podling.current.map(&:id)
+ podlings = ASF::Podling.allids
# Add group names unless they are a PMC group
person.groups.map(&:name).each do |group|
@@ -96,6 +98,7 @@ class Committer
response[:committees] << project
elsif podlings.include? project
response[:podlings] << project
+ response[:podling_owner] << project
else
# TODO should this populate anything?
end
@@ -108,6 +111,7 @@ class Committer
response[:committer] << project
elsif podlings.include? project
response[:podlings] << project
+ response[:podling_member] << project
else
# TODO should this populate anything?
end
@@ -121,14 +125,19 @@ class Committer
response[:groups] << group if members.include? id
end
- response[:committees].sort!
- response[:groups].sort!
- response[:committer].sort!
- response[:podlings].sort!
response[:committees].uniq!
response[:groups].uniq!
response[:committer].uniq!
response[:podlings].uniq!
+ response[:podling_owner].uniq!
+ response[:podling_member].uniq!
+
+ response[:committees].sort!
+ response[:groups].sort!
+ response[:committer].sort!
+ response[:podlings].sort!
+ response[:podling_owner].sort!
+ response[:podling_member].sort!
member = {} # collect member info
diff --git a/www/roster/views/person/main.js.rb
b/www/roster/views/person/main.js.rb
index 5bdcd585..d16190c7 100644
--- a/www/roster/views/person/main.js.rb
+++ b/www/roster/views/person/main.js.rb
@@ -37,7 +37,7 @@ class Person < Vue
end
unless pmcs.empty?
_div.row do
- _div.name 'PMCs'
+ _div.name 'PMC member'
_div.value do
_ul pmcs do |pmc|
_li {
@@ -139,13 +139,29 @@ class Person < Vue
end
# Podlings
- unless @committer.podlings.empty?
+ unless @committer.podling_owner.empty?
_div.row do
- _div.name 'Podlings'
+ _div.name 'PPMC member'
_div.value do
- _ul @committer.podlings do |podlings|
- _li {_a podlings, href: "ppmc/#{podlings}"}
+ _ul @committer.podling_owner do |podling|
+ _li {_a podling, href: "ppmc/#{podling}"}
+ unless @committer.podling_member.include?(podling)
+ _b ' (not in LDAP committer group)'
+ end
+ end
+ end
+ end
+ end
+
+ unless @committer.podling_member.empty?
+ _div.row do
+ _div.name 'PPMC committer'
+ _div.value do
+ _ul @committer.podling_member do |podling|
+ next if @committer.podling_owner.include? podling
+ _li {_a podling, href: "ppmc/#{podling}"}
end
+ _ '(excludes PPMCs listed above)' unless
@committer.podling_owner.empty?
end
end
end
