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 f52c6a3 identify ppmc members and committers that aren't
incubator committers
f52c6a3 is described below
commit f52c6a3ae378d66a8f45f8dfacb7f078df879b99
Author: Sam Ruby <[email protected]>
AuthorDate: Sun May 28 11:10:45 2017 -0400
identify ppmc members and committers that aren't incubator committers
---
www/roster/models/ppmc.rb | 10 ++++++++--
www/roster/views/ppmc/committers.js.rb | 2 ++
www/roster/views/ppmc/members.js.rb | 2 ++
3 files changed, 12 insertions(+), 2 deletions(-)
diff --git a/www/roster/models/ppmc.rb b/www/roster/models/ppmc.rb
index 8d8d130..796f856 100644
--- a/www/roster/models/ppmc.rb
+++ b/www/roster/models/ppmc.rb
@@ -26,8 +26,14 @@ class PPMC
lists = lists.select {|list, mode| mode == 'public'}
end
+ incubator_committers = ASF::Group.find('incubator').members
+
roster = ppmc.members.map {|person|
- [person.id, {name: person.public_name, member: person.asf_member?}]
+ [person.id, {
+ name: person.public_name,
+ member: person.asf_member?,
+ icommit: incubator_committers.include?(person)
+ }]
}.to_h
ppmc.mentors.each do |mentor|
@@ -36,7 +42,7 @@ class PPMC
roster[person.id] = {
name: person.public_name,
member: person.asf_member?,
- issue: 'listed as mentor, but not a member of the PPMC'
+ icommit: incubator_committers.include?(person)
}
end
diff --git a/www/roster/views/ppmc/committers.js.rb
b/www/roster/views/ppmc/committers.js.rb
index 084eb17..c3c59bd 100644
--- a/www/roster/views/ppmc/committers.js.rb
+++ b/www/roster/views/ppmc/committers.js.rb
@@ -118,6 +118,8 @@ class PPMCCommitter < React
"#{@@ppmc.display_name} PPMC?"
end
end
+ elsif not @@person.icommit
+ _span.issue 'not listed as an incubator committer'
else
_td ''
end
diff --git a/www/roster/views/ppmc/members.js.rb
b/www/roster/views/ppmc/members.js.rb
index d48b786..56ebaf3 100644
--- a/www/roster/views/ppmc/members.js.rb
+++ b/www/roster/views/ppmc/members.js.rb
@@ -159,6 +159,8 @@ class PPMCMember < React
_span 'pending'
elsif not @@ppmc.committers.include? @@person.id
_span.issue 'not listed as a committer'
+ elsif not @@person.icommit
+ _span.issue 'not listed as an incubator committer'
end
end
end
--
To stop receiving notification emails like this one, please contact
['"[email protected]" <[email protected]>'].
