[whimsy] branch master updated: display hudson-jobadmin in roster/group

[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 a926eb7  display hudson-jobadmin in roster/group
a926eb7 is described below

commit a926eb7896d4893755e127579504a3bfc984f2be
Author: Sam Ruby <ru...@intertwingly.net>
AuthorDate: Tue Jul 4 11:18:55 2017 -0400

    display hudson-jobadmin in roster/group
---
 lib/whimsy/asf/ldap.rb     | 4 ++++
 www/roster/models/group.rb | 2 +-
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/lib/whimsy/asf/ldap.rb b/lib/whimsy/asf/ldap.rb
index b75ebe8..3385443 100644
--- a/lib/whimsy/asf/ldap.rb
+++ b/lib/whimsy/asf/ldap.rb
@@ -1168,6 +1168,10 @@ module ASF
   # only used for <tt>hudson-jobadmin</tt>
   class AppGroup < Service
     @base = 'ou=apps,ou=groups,dc=apache,dc=org'
+
+    def self.list(filter='cn=*')
+      ASF.search_subtree(base, filter, 'cn').flatten.map {|cn| find(cn)}
+    end
   end
 
   # <tt>ou=auth</tt> subtree of <tt>ou=groups,dc=apache,dc=org</tt>, used for
diff --git a/www/roster/models/group.rb b/www/roster/models/group.rb
index 093db97..8fc3f79 100644
--- a/www/roster/models/group.rb
+++ b/www/roster/models/group.rb
@@ -23,7 +23,7 @@ class Group
     groups += ASF::AuthGroup.list.map {|group| [group, "LDAP Auth Group"]}
 
     # add app groups
-    groups += ASF::AppGroup.list.map {|app| [app, "LDAP app group"]}
+    groups += ASF::AppGroup.list.map {|app| [app.id, "LDAP app group"]}
 
     groups.sort
   end

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