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/29 19:59:16 UTC
[whimsy] branch master updated: prep for add, mod, search
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 e874612 prep for add, mod, search
e874612 is described below
commit e874612946380b519c6c60ddca60c239a08587a0
Author: Sam Ruby <ru...@intertwingly.net>
AuthorDate: Sat Jul 29 15:58:52 2017 -0400
prep for add, mod, search
---
www/roster/models/ppmc.rb | 7 +++++--
www/roster/views/ppmc/committers.js.rb | 14 ++++++++++++++
www/roster/views/ppmc/members.js.rb | 14 ++++++++++++++
www/roster/views/ppmc/mentors.js.rb | 16 +++++++++++++++-
4 files changed, 48 insertions(+), 3 deletions(-)
diff --git a/www/roster/models/ppmc.rb b/www/roster/models/ppmc.rb
index 1cdb65d..5a18f1c 100644
--- a/www/roster/models/ppmc.rb
+++ b/www/roster/models/ppmc.rb
@@ -19,12 +19,14 @@ class PPMC
pmc = ASF::Committee.find('incubator')
ipmc = pmc.owners
incubator_committers = pmc.committers
+ owners = ppmc.owners
roster = ppmc.members.map {|person|
[person.id, {
name: person.public_name,
member: person.asf_member?,
- icommit: incubator_committers.include?(person)
+ icommit: incubator_committers.include?(person),
+ role: (owners.include?(person) ? 'PPMC Member' : 'Committer')
}]
}.to_h
@@ -34,7 +36,8 @@ class PPMC
name: person.public_name,
member: person.asf_member?,
ipmc: ipmc.include?(person),
- icommit: incubator_committers.include?(person)
+ icommit: incubator_committers.include?(person),
+ role: 'Mentor'
}
end
diff --git a/www/roster/views/ppmc/committers.js.rb b/www/roster/views/ppmc/committers.js.rb
index dd1e31a..4a56429 100644
--- a/www/roster/views/ppmc/committers.js.rb
+++ b/www/roster/views/ppmc/committers.js.rb
@@ -13,6 +13,7 @@ class PPMCCommitters < React
_table.table.table_hover do
_thead do
_tr do
+ _th if @@auth.ppmc
_th 'id'
_th 'public name'
_th 'notes'
@@ -109,6 +110,13 @@ class PPMCCommitter < React
def render
_tr onDoubleClick: self.select do
+ if @@auth.ppmc
+ _td do
+ _input type: 'checkbox', checked: @@person.selected || false,
+ onChange: -> {self.toggleSelect(@@person)}, disabled: true
+ end
+ end
+
if @@person.member
_td { _b { _a @@person.id, href: "committer/#{@@person.id}"} }
_td { _b @@person.name }
@@ -176,4 +184,10 @@ class PPMCCommitter < React
window.getSelection().removeAllRanges()
@state = ( @state == :open ? :closed : :open )
end
+
+ # toggle checkbox
+ def toggleSelect(person)
+ person.selected = !person.selected
+ PPMC.refresh()
+ end
end
diff --git a/www/roster/views/ppmc/members.js.rb b/www/roster/views/ppmc/members.js.rb
index f0622e2..79f51d1 100644
--- a/www/roster/views/ppmc/members.js.rb
+++ b/www/roster/views/ppmc/members.js.rb
@@ -14,6 +14,7 @@ class PPMCMembers < React
_table.table.table_hover do
_thead do
_tr do
+ _th if @@auth.ppmc
_th 'id'
_th 'public name'
_th 'notes'
@@ -109,6 +110,13 @@ class PPMCMember < React
def render
_tr onDoubleClick: self.select do
+ if @@auth.ppmc
+ _td do
+ _input type: 'checkbox', checked: @@person.selected || false,
+ onChange: -> {self.toggleSelect(@@person)}, disabled: true
+ end
+ end
+
if @@person.member
_td { _b { _a @@person.id, href: "committer/#{@@person.id}" } }
_td { _b @@person.name }
@@ -191,4 +199,10 @@ class PPMCMember < React
window.getSelection().removeAllRanges()
@state = ( @state == :open ? :closed : :open )
end
+
+ # toggle checkbox
+ def toggleSelect(person)
+ person.selected = !person.selected
+ PPMC.refresh()
+ end
end
diff --git a/www/roster/views/ppmc/mentors.js.rb b/www/roster/views/ppmc/mentors.js.rb
index 93b79f5..d073d7b 100644
--- a/www/roster/views/ppmc/mentors.js.rb
+++ b/www/roster/views/ppmc/mentors.js.rb
@@ -15,6 +15,7 @@ class PPMCMentors < React
_table.table.table_hover do
_thead do
_tr do
+ _th if @@auth.ipmc
_th 'id'
_th 'public name'
_th 'notes'
@@ -116,7 +117,7 @@ class PPMCMentors < React
end
#
-# Show a mentor forthe PPMC
+# Show a mentor of the PPMC
#
class PPMCMentor < React
@@ -127,6 +128,13 @@ class PPMCMentor < React
def render
_tr onDoubleClick: self.select do
+ if @@auth.ipmc
+ _td do
+ _input type: 'checkbox', checked: @@person.selected || false,
+ onChange: -> {self.toggleSelect(@@person)}, disabled: true
+ end
+ end
+
if @@person.member
_td { _b { _a @@person.id, href: "committer/#{@@person.id}" } }
_td { _b @@person.name }
@@ -210,4 +218,10 @@ class PPMCMentor < React
window.getSelection().removeAllRanges()
@state = ( @state == :open ? :closed : :open )
end
+
+ # toggle checkbox
+ def toggleSelect(person)
+ person.selected = !person.selected
+ PPMC.refresh()
+ end
end
--
To stop receiving notification emails like this one, please contact
['"commits@whimsical.apache.org" <co...@whimsical.apache.org>'].