whimsical-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From s...@apache.org
Subject [whimsy] branch master updated: Not all groups have a DN
Date Sat, 08 Dec 2018 10:32:51 GMT
This is an automated email from the ASF dual-hosted git repository.

sebb 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 970ec42  Not all groups have a DN
970ec42 is described below

commit 970ec4224b10efaedeb94253dad5225e9b3cfb26
Author: Sebb <sebb@apache.org>
AuthorDate: Sat Dec 8 10:32:42 2018 +0000

    Not all groups have a DN
---
 www/roster/models/group.rb | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/www/roster/models/group.rb b/www/roster/models/group.rb
index 93e54da..4b235da 100644
--- a/www/roster/models/group.rb
+++ b/www/roster/models/group.rb
@@ -57,7 +57,7 @@ class Group
       response = {
         id: id,
         type: type,
-        dn: group.dn,
+        dn: (group.dn rescue ''), # not all groups have a DN
         members: Hash[group.members.map {|person| [person.id, (person.cn rescue '**Entry
missing from LDAP people**')]}] # if id not in people
       }
 
@@ -85,7 +85,7 @@ class Group
         response = {
           id: id,
           type: type,
-          dn: group.dn,
+          dn: (group.dn rescue ''), # not all groups have a DN
           members: Hash[group.map {|person| [person.id, person.cn]}]
         }
       end


Mime
View raw message