You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@whimsical.apache.org by ru...@apache.org on 2017/07/12 23:01:10 UTC
[whimsy] branch master updated (05f53de -> ff4fd15)
This is an automated email from the ASF dual-hosted git repository.
rubys pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/whimsy.git.
from 05f53de rough in search
new 04671a1 reduce LDAP to a simple list
new ff4fd15 collapse committers
The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
www/roster/models/committee.rb | 4 ++--
www/roster/views/pmc/committers.js.rb | 12 +++++++-----
www/roster/views/pmc/pmc.js.rb | 12 ++++++------
3 files changed, 15 insertions(+), 13 deletions(-)
--
To stop receiving notification emails like this one, please contact
['"commits@whimsical.apache.org" <co...@whimsical.apache.org>'].
[whimsy] 01/02: reduce LDAP to a simple list
Posted by 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 04671a191f83c9861d74928b53b2aa993926e64a
Author: Sam Ruby <ru...@intertwingly.net>
AuthorDate: Wed Jul 12 18:49:15 2017 -0400
reduce LDAP to a simple list
---
www/roster/models/committee.rb | 2 +-
www/roster/views/pmc/committers.js.rb | 2 +-
www/roster/views/pmc/pmc.js.rb | 6 +++---
3 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/www/roster/models/committee.rb b/www/roster/models/committee.rb
index 3a59c12..d85e5fe 100644
--- a/www/roster/models/committee.rb
+++ b/www/roster/models/committee.rb
@@ -53,7 +53,7 @@ class Committee
report: pmc.report,
site: pmc.site,
established: pmc.established,
- ldap: Hash[members.map {|person| [person.id, person.cn]}],
+ ldap: members.map(&:id),
members: pmc.roster.keys,
committers: Hash[committers.map {|person| [person.id, person.cn]}],
asfmembers: (ASF.members & people).map(&:id),
diff --git a/www/roster/views/pmc/committers.js.rb b/www/roster/views/pmc/committers.js.rb
index d073915..16b28d8 100644
--- a/www/roster/views/pmc/committers.js.rb
+++ b/www/roster/views/pmc/committers.js.rb
@@ -27,7 +27,7 @@ class PMCCommitters < React
_tbody do
@committers.each do |person|
next if @@committee.members.include? person.id
- next if @@committee.ldap[person.id]
+ next if @@committee.ldap.include? person.id
_PMCCommitter auth: @@auth, person: person, committee: @@committee
end
diff --git a/www/roster/views/pmc/pmc.js.rb b/www/roster/views/pmc/pmc.js.rb
index 8e2edf0..7b01f2c 100644
--- a/www/roster/views/pmc/pmc.js.rb
+++ b/www/roster/views/pmc/pmc.js.rb
@@ -49,7 +49,7 @@ class PMCMembers < React
roster = []
for id in @@committee.roster
- if @@committee.members.include?(id) or @@committee.ldap[id]
+ if @@committee.members.include?(id) or @@committee.ldap.include?(id)
person = @@committee.roster[id]
person.id = id
roster << person
@@ -113,7 +113,7 @@ class PMCMember < React
committers = @@committee.committers.keys()
- pmc = @@committee.ldap.keys()
+ pmc = @@committee.members
if committers.all? {|person| pmc.include? person}
_button.btn.btn_warning 'Add as a committer only',
data_action: 'add commit',
@@ -136,7 +136,7 @@ class PMCMember < React
data_confirmation: "Add to #{@@person.name} committee-info.txt"
end
elsif not @@person.ldap
- # in committee-info.txt but not in ldap
+ # in committee-info.txt but not in LDAP
_button.btn.btn_success 'Add to LDAP',
data_action: 'add pmc',
data_target: '#confirm', data_toggle: 'modal',
--
To stop receiving notification emails like this one, please contact
"commits@whimsical.apache.org" <co...@whimsical.apache.org>.
[whimsy] 02/02: collapse committers
Posted by 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 ff4fd15bad360ceec386f940f754e13d84f42f4e
Author: Sam Ruby <ru...@intertwingly.net>
AuthorDate: Wed Jul 12 19:01:01 2017 -0400
collapse committers
---
www/roster/models/committee.rb | 2 +-
www/roster/views/pmc/committers.js.rb | 10 ++++++----
www/roster/views/pmc/pmc.js.rb | 6 +++---
3 files changed, 10 insertions(+), 8 deletions(-)
diff --git a/www/roster/models/committee.rb b/www/roster/models/committee.rb
index d85e5fe..335e949 100644
--- a/www/roster/models/committee.rb
+++ b/www/roster/models/committee.rb
@@ -55,7 +55,7 @@ class Committee
established: pmc.established,
ldap: members.map(&:id),
members: pmc.roster.keys,
- committers: Hash[committers.map {|person| [person.id, person.cn]}],
+ committers: committers.map(&:id),
asfmembers: (ASF.members & people).map(&:id),
roster: roster,
mail: Hash[lists.sort],
diff --git a/www/roster/views/pmc/committers.js.rb b/www/roster/views/pmc/committers.js.rb
index 16b28d8..86b22dd 100644
--- a/www/roster/views/pmc/committers.js.rb
+++ b/www/roster/views/pmc/committers.js.rb
@@ -5,8 +5,8 @@
class PMCCommitters < React
def render
if
- @@committee.committers.keys().all? do |id|
- @@committee.roster[id] or @@committee.members.include? id
+ @@committee.committers.all? do |id|
+ @@committee.members.include? id
end
then
_p 'All committers are members of the PMC'
@@ -56,8 +56,10 @@ class PMCCommitters < React
def componentWillReceiveProps()
committers = []
- for id in @@committee.committers
- committers << {id: id, name: @@committee.committers[id]}
+ @@committee.committers.each do |id|
+ person = @@committee.roster[id]
+ person.id = id
+ committers << person
end
@committers = committers.sort_by {|person| person.name}
diff --git a/www/roster/views/pmc/pmc.js.rb b/www/roster/views/pmc/pmc.js.rb
index 7b01f2c..6229fcd 100644
--- a/www/roster/views/pmc/pmc.js.rb
+++ b/www/roster/views/pmc/pmc.js.rb
@@ -112,7 +112,7 @@ class PMCMember < React
"#{@@committee.display_name} PMC?"
- committers = @@committee.committers.keys()
+ committers = @@committee.committers
pmc = @@committee.members
if committers.all? {|person| pmc.include? person}
_button.btn.btn_warning 'Add as a committer only',
@@ -149,7 +149,7 @@ class PMCMember < React
"Remove #{@@person.name} from committee-info.txt?"
else
# in both LDAP and committee-info.txt
- if @@committee.committers[@@person.id]
+ if @@committee.committers.include? @@person.id
_button.btn.btn_warning 'Remove only from PMC',
data_action: 'remove pmc info',
data_target: '#confirm', data_toggle: 'modal',
@@ -179,7 +179,7 @@ class PMCMember < React
_td.issue 'not in committee-info.txt'
elsif not @@person.ldap
_td.issue 'not in LDAP'
- elsif not @@committee.committers[@@person.id]
+ elsif not @@committee.committers.include? @@person.id
_td.issue 'not in committer list'
elsif @@person.id == @@committee.chair
_td.chair 'chair'
--
To stop receiving notification emails like this one, please contact
"commits@whimsical.apache.org" <co...@whimsical.apache.org>.