whimsical-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ru...@apache.org
Subject [whimsy] branch master updated: permit the removal of invalid ids
Date Mon, 09 Oct 2017 13:46:09 GMT
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 24bf66f  permit the removal of invalid ids
24bf66f is described below

commit 24bf66f12d9e71652d0527b51c8c7f43cdfd5206
Author: Sam Ruby <rubys@intertwingly.net>
AuthorDate: Mon Oct 9 09:45:58 2017 -0400

    permit the removal of invalid ids
---
 www/roster/views/actions/committee.json.rb | 5 ++++-
 www/roster/views/actions/ppmc.json.rb      | 5 ++++-
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/www/roster/views/actions/committee.json.rb b/www/roster/views/actions/committee.json.rb
index cf6f909..35c7555 100644
--- a/www/roster/views/actions/committee.json.rb
+++ b/www/roster/views/actions/committee.json.rb
@@ -5,7 +5,10 @@ if env.password
   group = ASF::Group.find(@project) if @targets.include? 'commit'
 
   # validate arguments
-  raise ArgumentError.new("ids=#{@ids}") if people.any? {|person| person.nil?}
+  if @action != 'remove' and people.any? {|person| person.nil?}
+    raise ArgumentError.new("ids=#{@ids}") 
+  end
+
   raise ArgumentError.new("project=#{@project}") unless pmc
 
   # update LDAP
diff --git a/www/roster/views/actions/ppmc.json.rb b/www/roster/views/actions/ppmc.json.rb
index 4cb68f6..f529d19 100644
--- a/www/roster/views/actions/ppmc.json.rb
+++ b/www/roster/views/actions/ppmc.json.rb
@@ -10,7 +10,10 @@ if env.password
   end
 
   # validate arguments
-  raise ArgumentError.new("ids=#{@ids}") if people.any? {|person| person.nil?}
+  if @action != 'remove' and people.any? {|person| person.nil?}
+    raise ArgumentError.new("ids=#{@ids}") 
+  end
+
   raise ArgumentError.new("project=#{@project}") unless project
 
   # update LDAP

-- 
To stop receiving notification emails like this one, please contact
['"commits@whimsical.apache.org" <commits@whimsical.apache.org>'].

Mime
View raw message