This is an automated email from the ASF dual-hosted git repository.
sebb 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 2a2e830f WHIMSY-420 - drop NOTICE requirement
2a2e830f is described below
commit 2a2e830fcdde895387ed387dea2707abc4a19216
Author: Sebb <[email protected]>
AuthorDate: Wed Oct 23 16:35:00 2024 +0100
WHIMSY-420 - drop NOTICE requirement
---
www/roster/views/pmc/add.js.rb | 15 +--------------
www/roster/views/pmc/mod.js.rb | 19 +------------------
www/roster/views/ppmc/add.js.rb | 14 +-------------
3 files changed, 3 insertions(+), 45 deletions(-)
diff --git a/www/roster/views/pmc/add.js.rb b/www/roster/views/pmc/add.js.rb
index aa5dfe51..2aa52af4 100644
--- a/www/roster/views/pmc/add.js.rb
+++ b/www/roster/views/pmc/add.js.rb
@@ -54,19 +54,6 @@ class PMCAdd < Vue
exclude: @@project.roster.keys().
concat(@people.map {|person| person.id})
- _p do
- _br
- _b do
- _ 'Before adding a new PMC member, '
- _a 'email notification must be sent to the Board mailing
list',
- href:
'https://www.apache.org/dev/pmc.html#send-the-board-a-notice-of-the-vote-to-add-someone'
- _ ' (cc: the PMC private@ mailing list).'
- end
- _label do
- _span 'Has the NOTICE email been received by the board list?'
- _input type: 'checkbox', checked: @notice_elapsed
- end
- end
end
end
@@ -84,7 +71,7 @@ class PMCAdd < Vue
_button.btn.btn_primary 'Add to PMC', onClick: self.post,
data_action: 'add pmc info commit',
- disabled: (@people.empty? or not @notice_elapsed)
+ disabled: (@people.empty?)
end
end
end
diff --git a/www/roster/views/pmc/mod.js.rb b/www/roster/views/pmc/mod.js.rb
index 01b9e23c..f9313fd9 100644
--- a/www/roster/views/pmc/mod.js.rb
+++ b/www/roster/views/pmc/mod.js.rb
@@ -39,23 +39,6 @@ class PMCMod < Vue
end
end
end
-
- # add to PMC button is only shown if every person is not on the PMC
- if @people.all? {|person| !@@project.members.include? person.id}
- _p do
- _br
- _b do
- _ 'Before adding a new PMC member, '
- _a 'email notification must have been received by the Board
mailing list',
- href:
'https://www.apache.org/dev/pmc.html#send-the-board-a-notice-of-the-vote-to-add-someone'
- _ ' (cc: the PMC private@ mailing list).'
- end
- _label do
- _span 'Has the NOTICE email been received by the board list?'
- _input type: 'checkbox', checked: @notice_elapsed
- end
- end
- end
end
_div.modal_footer do
@@ -68,7 +51,7 @@ class PMCMod < Vue
if @people.all? {|person| !@@project.members.include? person.id}
_button.btn.btn_primary 'Add to PMC',
data_action: 'add pmc info',
- onClick: self.post, disabled: (@people.empty? or not
@notice_elapsed)
+ onClick: self.post, disabled: (@people.empty?)
end
# remove from all relevant locations
diff --git a/www/roster/views/ppmc/add.js.rb b/www/roster/views/ppmc/add.js.rb
index 3669f3c1..2c2f214d 100644
--- a/www/roster/views/ppmc/add.js.rb
+++ b/www/roster/views/ppmc/add.js.rb
@@ -54,18 +54,6 @@ class PPMCAdd < Vue
exclude: @@project.roster.keys().
concat(@people.map {|person| person.id})
- _p do
- _br
- _b do
- _ 'Before adding a new PPMC member, '
- _a 'email notification must be sent to the Incubator private
mailing list',
- href:
'https://incubator.apache.org/guides/ppmc.html#voting_in_a_new_ppmc_member'
- end
- _label do
- _span 'Has the NOTICE email been received by the Incubator
list?'
- _input type: 'checkbox', checked: @notice_elapsed
- end
- end
end
end
@@ -84,7 +72,7 @@ class PPMCAdd < Vue
_button.btn.btn_primary 'Add to PPMC', onClick: self.post,
data_action: 'add ppmc committer',
- disabled: (@people.empty? or not @notice_elapsed)
+ disabled: (@people.empty?)
end
if @@auth.ipmc
