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/09/08 17:09:30 UTC
[whimsy] branch master updated (a4ff0d2 -> 6e4d6fc)
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 a4ff0d2 more cleanup and use of computed properties
new 220aca0 make how ASF members are handled more consistent
new 6e4d6fc decouple components from their parents
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 | 16 +++++++++++-----
www/roster/views/pmc/committers.js.rb | 4 ++--
www/roster/views/pmc/main.js.rb | 12 ++----------
www/roster/views/pmc/pmc.js.rb | 4 ++--
www/roster/views/pmc/roster.js.rb | 4 ++--
www/roster/views/ppmc/committers.js.rb | 2 +-
www/roster/views/ppmc/main.js.rb | 10 +---------
www/roster/views/ppmc/members.js.rb | 2 +-
www/roster/views/ppmc/mentors.js.rb | 2 +-
www/roster/views/ppmc/roster.js.rb | 2 +-
10 files changed, 24 insertions(+), 34 deletions(-)
--
To stop receiving notification emails like this one, please contact
['"commits@whimsical.apache.org" <co...@whimsical.apache.org>'].
[whimsy] 02/02: decouple components from their parents
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 6e4d6fc006d5dc20e714bfb16910720295694c96
Author: Sam Ruby <ru...@intertwingly.net>
AuthorDate: Fri Sep 8 13:02:41 2017 -0400
decouple components from their parents
---
www/roster/views/pmc/committers.js.rb | 2 +-
www/roster/views/pmc/main.js.rb | 12 ++----------
www/roster/views/pmc/pmc.js.rb | 2 +-
www/roster/views/pmc/roster.js.rb | 2 +-
www/roster/views/ppmc/committers.js.rb | 2 +-
www/roster/views/ppmc/main.js.rb | 10 +---------
www/roster/views/ppmc/members.js.rb | 2 +-
www/roster/views/ppmc/mentors.js.rb | 2 +-
www/roster/views/ppmc/roster.js.rb | 2 +-
9 files changed, 10 insertions(+), 26 deletions(-)
diff --git a/www/roster/views/pmc/committers.js.rb b/www/roster/views/pmc/committers.js.rb
index 7a7468d..3baee6c 100644
--- a/www/roster/views/pmc/committers.js.rb
+++ b/www/roster/views/pmc/committers.js.rb
@@ -76,6 +76,6 @@ class PMCCommitter < Vue
# toggle checkbox
def toggleSelect(person)
person.selected = !person.selected
- PMC.refresh()
+ @@committee.refresh()
end
end
diff --git a/www/roster/views/pmc/main.js.rb b/www/roster/views/pmc/main.js.rb
index ce8c271..f52f559 100644
--- a/www/roster/views/pmc/main.js.rb
+++ b/www/roster/views/pmc/main.js.rb
@@ -199,20 +199,12 @@ class PMC < Vue
self.update(@@committee)
end
- # refresh the current page
- def refresh()
- Vue.forceUpdate()
- end
-
- def mounted()
- # export refesh method
- PMC.refresh = self.refresh
- end
-
# update committee from conformation form
def update(committee)
@committee = committee
+ @committee.refresh = proc { Vue.forceUpdate() }
+
if @attic == nil and not committee.established and defined? fetch
@attic = []
diff --git a/www/roster/views/pmc/pmc.js.rb b/www/roster/views/pmc/pmc.js.rb
index beaaa69..a3d4316 100644
--- a/www/roster/views/pmc/pmc.js.rb
+++ b/www/roster/views/pmc/pmc.js.rb
@@ -150,6 +150,6 @@ class PMCMember < Vue
# toggle checkbox
def toggleSelect(person)
person.selected = !person.selected
- PMC.refresh()
+ @@committee.refresh()
end
end
diff --git a/www/roster/views/pmc/roster.js.rb b/www/roster/views/pmc/roster.js.rb
index 36a6381..0976a93 100644
--- a/www/roster/views/pmc/roster.js.rb
+++ b/www/roster/views/pmc/roster.js.rb
@@ -65,6 +65,6 @@ class PMCRoster < Vue
def toggleSelect(person)
person.selected = !person.selected
- PMC.refresh()
+ @@committee.refresh()
end
end
diff --git a/www/roster/views/ppmc/committers.js.rb b/www/roster/views/ppmc/committers.js.rb
index 95001c6..9539dcd 100644
--- a/www/roster/views/ppmc/committers.js.rb
+++ b/www/roster/views/ppmc/committers.js.rb
@@ -110,6 +110,6 @@ class PPMCCommitter < Vue
# toggle checkbox
def toggleSelect(person)
person.selected = !person.selected
- PPMC.refresh()
+ @@ppmc.refresh()
end
end
diff --git a/www/roster/views/ppmc/main.js.rb b/www/roster/views/ppmc/main.js.rb
index 4cdc4a9..0423f42 100644
--- a/www/roster/views/ppmc/main.js.rb
+++ b/www/roster/views/ppmc/main.js.rb
@@ -214,16 +214,8 @@ class PPMC < Vue
# update ppmc from conformation form
def update(ppmc)
@ppmc = ppmc
- end
-
- # refresh the current page
- def refresh()
- Vue.forceUpdate()
- end
- def mounted()
- # export refesh method
- PPMC.refresh = self.refresh
+ @ppmc.refresh = proc { Vue.forceUpdate() }
end
# create project in ldap
diff --git a/www/roster/views/ppmc/members.js.rb b/www/roster/views/ppmc/members.js.rb
index 7142d2b..573c75e 100644
--- a/www/roster/views/ppmc/members.js.rb
+++ b/www/roster/views/ppmc/members.js.rb
@@ -90,6 +90,6 @@ class PPMCMember < Vue
# toggle checkbox
def toggleSelect(person)
person.selected = !person.selected
- PPMC.refresh()
+ @@ppmc.refresh()
end
end
diff --git a/www/roster/views/ppmc/mentors.js.rb b/www/roster/views/ppmc/mentors.js.rb
index 9bcabe4..86efb2d 100644
--- a/www/roster/views/ppmc/mentors.js.rb
+++ b/www/roster/views/ppmc/mentors.js.rb
@@ -94,6 +94,6 @@ class PPMCMentor < Vue
# toggle checkbox
def toggleSelect(person)
person.selected = !person.selected
- PPMC.refresh()
+ @@ppmc.refresh()
end
end
diff --git a/www/roster/views/ppmc/roster.js.rb b/www/roster/views/ppmc/roster.js.rb
index bcbf226..67c2c67 100644
--- a/www/roster/views/ppmc/roster.js.rb
+++ b/www/roster/views/ppmc/roster.js.rb
@@ -65,6 +65,6 @@ class PPMCRoster < Vue
def toggleSelect(person)
person.selected = !person.selected
- PPMC.refresh()
+ @@ppmc.refresh()
end
end
--
To stop receiving notification emails like this one, please contact
"commits@whimsical.apache.org" <co...@whimsical.apache.org>.
[whimsy] 01/02: make how ASF members are handled more consistent
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 220aca0074c7dcb4749af233e4a6ec86d1f1ebaa
Author: Sam Ruby <ru...@intertwingly.net>
AuthorDate: Fri Sep 8 10:14:30 2017 -0400
make how ASF members are handled more consistent
---
www/roster/models/committee.rb | 16 +++++++++++-----
www/roster/views/pmc/committers.js.rb | 2 +-
www/roster/views/pmc/pmc.js.rb | 2 +-
www/roster/views/pmc/roster.js.rb | 2 +-
4 files changed, 14 insertions(+), 8 deletions(-)
diff --git a/www/roster/models/committee.rb b/www/roster/models/committee.rb
index 335e949..8abd75e 100644
--- a/www/roster/models/committee.rb
+++ b/www/roster/models/committee.rb
@@ -30,18 +30,25 @@ class Committee
end
roster = pmc.roster.dup
- roster.each {|key, info| info['role'] = 'PMC member'}
+ roster.each {|key, info| info[:role] = 'PMC member'}
members.each do |person|
- roster[person.id] ||= {name: person.public_name, role: 'PMC member'}
+ roster[person.id] ||= {
+ name: person.public_name,
+ role: 'PMC member'
+ }
roster[person.id]['ldap'] = true
end
committers.each do |person|
- roster[person.id] ||= {name: person.public_name}
- roster[person.id]['role'] ||= 'Committer'
+ roster[person.id] ||= {
+ name: person.public_name,
+ role: 'Committer'
+ }
end
+ roster.each {|id, info| info[:member] = ASF::Person.find(id).asf_member?}
+
roster[pmc.chair.id]['role'] = 'PMC chair' if pmc.chair
response = {
@@ -56,7 +63,6 @@ class Committee
ldap: members.map(&:id),
members: pmc.roster.keys,
committers: committers.map(&:id),
- asfmembers: (ASF.members & people).map(&:id),
roster: roster,
mail: Hash[lists.sort],
moderators: moderators,
diff --git a/www/roster/views/pmc/committers.js.rb b/www/roster/views/pmc/committers.js.rb
index 90d4c35..7a7468d 100644
--- a/www/roster/views/pmc/committers.js.rb
+++ b/www/roster/views/pmc/committers.js.rb
@@ -63,7 +63,7 @@ class PMCCommitter < Vue
end
end
- if @@committee.asfmembers.include? @@person.id
+ if @@person.member
_td { _b { _a @@person.id, href: "committer/#{@@person.id}"} }
_td { _b @@person.name }
else
diff --git a/www/roster/views/pmc/pmc.js.rb b/www/roster/views/pmc/pmc.js.rb
index a3885a2..beaaa69 100644
--- a/www/roster/views/pmc/pmc.js.rb
+++ b/www/roster/views/pmc/pmc.js.rb
@@ -61,7 +61,7 @@ class PMCMember < Vue
end
end
- if @@committee.asfmembers.include? @@person.id
+ if @@person.member
_td { _b { _a @@person.id, href: "committer/#{@@person.id}" } }
_td { _b @@person.name }
else
diff --git a/www/roster/views/pmc/roster.js.rb b/www/roster/views/pmc/roster.js.rb
index 610e6c4..36a6381 100644
--- a/www/roster/views/pmc/roster.js.rb
+++ b/www/roster/views/pmc/roster.js.rb
@@ -46,7 +46,7 @@ class PMCRoster < Vue
end
end
- if @@committee.asfmembers.include? person.id
+ if person.member
_td { _b { _a person.id, href: "committer/#{person.id}" } }
_td { _b person.name }
else
--
To stop receiving notification emails like this one, please contact
"commits@whimsical.apache.org" <co...@whimsical.apache.org>.