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: Show the group DN
Date Wed, 28 Nov 2018 20:26:36 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 aa66913  Show the group DN
aa66913 is described below

commit aa66913fc13dcba35ded419030f1a402ddc4bd86
Author: Sebb <sebb@apache.org>
AuthorDate: Wed Nov 28 20:26:08 2018 +0000

    Show the group DN
---
 www/roster/models/group.rb   | 2 ++
 www/roster/views/group.js.rb | 2 +-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/www/roster/models/group.rb b/www/roster/models/group.rb
index 42d6f00..7517ed5 100644
--- a/www/roster/models/group.rb
+++ b/www/roster/models/group.rb
@@ -57,6 +57,7 @@ class Group
       response = {
         id: id,
         type: type,
+        dn: group.dn,
         members: Hash[group.members.map {|person| [person.id, (person.cn rescue '**Entry
missing from LDAP people**')]}] # if id not in people
       }
 
@@ -84,6 +85,7 @@ class Group
         response = {
           id: id,
           type: type,
+          dn: group.dn,
           members: Hash[group.map {|person| [person.id, person.cn]}]
         }
       end
diff --git a/www/roster/views/group.js.rb b/www/roster/views/group.js.rb
index 40a6bb9..3af4ace 100644
--- a/www/roster/views/group.js.rb
+++ b/www/roster/views/group.js.rb
@@ -23,7 +23,7 @@ class Group < Vue
     # header
     _h1 do
       _span group.id
-      _span.note " (#{group.type})"
+      _span.note " (#{group.type}) #{group.dn}"
     end
 
     # usage information for authenticated users (group members, etc.)


Mime
View raw message