This is an automated email from the ASF dual-hosted git repository.
rubys pushed a commit to branch master
in repository https://git-dual.apache.org/repos/asf/whimsy.git
The following commit(s) were added to refs/heads/master by this push:
new 9bf862f allow pmc and commit removal to be decided separately
9bf862f is described below
commit 9bf862fe0e91329bca06c201f36dbebcd3da6eda
Author: Sam Ruby <rubys@intertwingly.net>
AuthorDate: Sat Nov 5 06:59:48 2016 -0400
allow pmc and commit removal to be decided separately
---
www/roster/views/pmc/pmc.js.rb | 24 ++++++++++++++++++------
1 file changed, 18 insertions(+), 6 deletions(-)
diff --git a/www/roster/views/pmc/pmc.js.rb b/www/roster/views/pmc/pmc.js.rb
index f80fa2d..7729235 100644
--- a/www/roster/views/pmc/pmc.js.rb
+++ b/www/roster/views/pmc/pmc.js.rb
@@ -144,13 +144,25 @@ class PMCMember < React
"Remove #{@@person.name} from committee-info.txt?"
else
# in both LDAP and committee-info.txt
- _button.btn.btn_warning 'Remove from PMC',
- data_action: 'remove pmc info commit',
- data_target: '#confirm', data_toggle: 'modal',
- data_confirmation: "Remove #{@@person.name} from the " +
- "#{@@committee.display_name} PMC?"
+ if @@committee.committers[@@person.id]
+ _button.btn.btn_warning 'Remove only from PMC',
+ data_action: 'remove pmc info',
+ data_target: '#confirm', data_toggle: 'modal',
+ data_confirmation: "Remove #{@@person.name} from the " +
+ "#{@@committee.display_name} PMC but leave as a committer?"
+
+ _button.btn.btn_warning 'Remove as committer and from PMC',
+ data_action: 'remove pmc info commit',
+ data_target: '#confirm', data_toggle: 'modal',
+ data_confirmation: "Remove #{@@person.name} as commiter and " +
+ "from the #{@@committee.display_name} PMC?"
+ else
+ _button.btn.btn_warning 'Remove from PMC',
+ data_action: 'remove pmc info',
+ data_target: '#confirm', data_toggle: 'modal',
+ data_confirmation: "Remove #{@@person.name} from the " +
+ "#{@@committee.display_name} PMC?"
- if not @@committee.committers[@@person.id]
_button.btn.btn_primary 'Add as a committer',
data_action: 'add commit',
data_target: '#confirm', data_toggle: 'modal',
--
To stop receiving notification emails like this one, please contact
['"commits@whimsical.apache.org" <commits@whimsical.apache.org>'].
|