[whimsy] branch master updated: client side of hudson-jobadmin editing

[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


The following commit(s) were added to refs/heads/master by this push:
     new 532de97  client side of hudson-jobadmin editing
532de97 is described below

commit 532de97ffb8c4b34407e5ccab786f0abcb7d9a0f
Author: Sam Ruby <ru...@intertwingly.net>
AuthorDate: Tue Jul 4 12:06:13 2017 -0400

    client side of hudson-jobadmin editing
---
 www/roster/models/auth.rb    | 4 ++++
 www/roster/models/group.rb   | 5 +++++
 www/roster/views/group.js.rb | 4 ++++
 3 files changed, 13 insertions(+)

diff --git a/www/roster/models/auth.rb b/www/roster/models/auth.rb
index 8bfbf7d..66c02f5 100644
--- a/www/roster/models/auth.rb
+++ b/www/roster/models/auth.rb
@@ -17,6 +17,10 @@ class Auth
       info[:member] = true
     end
 
+    if ASF.pmc_chairs.include? user
+      info[:pmc_chair] = true
+    end
+
     info
   end
 end
diff --git a/www/roster/models/group.rb b/www/roster/models/group.rb
index 8fc3f79..7aa86a2 100644
--- a/www/roster/models/group.rb
+++ b/www/roster/models/group.rb
@@ -60,6 +60,11 @@ class Group
         members: Hash[group.members.map {|person| [person.id, person.cn]}]
       }
 
+      if id == 'hudson-jobadmin'
+        response[:owners] = ASF::Service.find('hudson-admin').members.
+          map {|owner| owner.id}
+      end
+
     else
 
       type = 'asf-auth'
diff --git a/www/roster/views/group.js.rb b/www/roster/views/group.js.rb
index afa7541..ab722e9 100644
--- a/www/roster/views/group.js.rb
+++ b/www/roster/views/group.js.rb
@@ -14,6 +14,8 @@ class Group < React
 
     if group.type == 'LDAP auth group' or group.id == 'asf-secretary'
       auth = (members.include? @@auth.id or @@auth.secretary or @@auth.root)
+    elsif group.id = 'hudson-jobadmin'
+      auth = @@auth.pmc_chair or group.owners.include? @@auth.id
     else
       auth = false 
     end
@@ -209,6 +211,8 @@ class GroupConfirm < React
       action = 'actions/authgroup'
     elsif @@group.type == 'LDAP service'
       action = 'actions/service'
+    elsif @@group.type == 'LDAP app group'
+      action = 'actions/appgroup'
     else
       alert "unsupported group type: #{@@group.type}"
       return

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