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 95d9c1d fix WHIMSY-295
95d9c1d is described below
commit 95d9c1dc99ce2d9464ce671878ce8ea8e96ac465
Author: Sam Ruby <[email protected]>
AuthorDate: Mon Oct 7 16:10:12 2019 -0400
fix WHIMSY-295
---
www/roster/models/auth.rb | 4 ++++
www/roster/views/actions/service.json.rb | 1 +
www/roster/views/group.js.rb | 2 ++
3 files changed, 7 insertions(+)
diff --git a/www/roster/models/auth.rb b/www/roster/models/auth.rb
index 66c02f5..1160e69 100644
--- a/www/roster/models/auth.rb
+++ b/www/roster/models/auth.rb
@@ -21,6 +21,10 @@ class Auth
info[:pmc_chair] = true
end
+ if ASF::Service['board'].members.include? user
+ info[:director] = true
+ end
+
info
end
end
diff --git a/www/roster/views/actions/service.json.rb
b/www/roster/views/actions/service.json.rb
index d801686..a668e1f 100644
--- a/www/roster/views/actions/service.json.rb
+++ b/www/roster/views/actions/service.json.rb
@@ -33,6 +33,7 @@ if env.password
# other committees
to = '[email protected]' if service.id == 'asf-secretary'
+ to = '[email protected]' if service.id == 'board'
# construct email
mail = Mail.new do
diff --git a/www/roster/views/group.js.rb b/www/roster/views/group.js.rb
index 3af4ace..bdaf5b2 100644
--- a/www/roster/views/group.js.rb
+++ b/www/roster/views/group.js.rb
@@ -14,6 +14,8 @@ class Group < Vue
if group.type == 'LDAP auth group' or group.id == 'asf-secretary'
auth = (members.include? @@auth.id or @@auth.secretary or @@auth.root)
+ elsif group.type == 'LDAP service' and group.id == 'board'
+ auth = (@@auth.director or @@auth.secretary or @@auth.root)
elsif group.id == 'hudson-jobadmin'
auth = @@auth.pmc_chair or group.owners.include? @@auth.id
else
