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: add auth groups
Date Tue, 02 Aug 2016 15:54:27 GMT
This is an automated email from the ASF dual-hosted git repository.

rubys pushed a commit to branch master
in repository https://git-dual.apache.org/repos/asf/whimsy.git

The following commit(s) were added to refs/heads/master by this push:
       new  ca40604   add auth groups
ca40604 is described below

commit ca40604cfe229fd0bec9c4d9a773749eba4a7471
Author: Sam Ruby <rubys@intertwingly.net>
AuthorDate: Tue Aug 2 11:54:14 2016 -0400

    add auth groups
---
 www/roster/models/group.rb | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/www/roster/models/group.rb b/www/roster/models/group.rb
index fc660cd..093db97 100644
--- a/www/roster/models/group.rb
+++ b/www/roster/models/group.rb
@@ -19,6 +19,9 @@ class Group
     groups += ASF::Authorization.new('pit').to_h.
       map {|id, list| [id, "PIT Auth"]}
 
+    # add authorization groups (LDAP)
+    groups += ASF::AuthGroup.list.map {|group| [group, "LDAP Auth Group"]}
+
     # add app groups
     groups += ASF::AppGroup.list.map {|app| [app, "LDAP app group"]}
 
@@ -32,6 +35,11 @@ class Group
     group = ASF::Group.find(id)
 
     if group.members.empty?
+      type = 'LDAP auth group'
+      group = ASF::AuthGroup.find(id)
+    end
+
+    if group.members.empty?
       type = 'LDAP service'
       group = ASF::Service.find(id)
     end

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

Mime
View raw message