When getting members let user indicate what type of member they want.

The memberOf attribute includes members that are directly in the group
via the "member" attribute and those that are included as a result of
being in a group that is in the group.

The UI needs to be able to distinguish between the two.

438706

1 files changed, 31 insertions, 2 deletions

diff --git a/ipa-server/ipa-gui/ipagui/subcontrollers/group.py b/ipa-server/ipa-gui/ipagui/subcontrollers/group.py
index 08ecf32a..eac5cb0b 100644
--- a/ipa-server/ipa-gui/ipagui/subcontrollers/group.py
+++ b/ipa-server/ipa-gui/ipagui/subcontrollers/group.py
@@ -208,7 +208,7 @@ class GroupController(IPAController):
             # convert members to users, for easier manipulation on the page
             #
 
-            members = client.group_members(group.dn, ['dn', 'givenname', 'sn', 'uid', 'cn'])
+            members = client.group_members(group.dn, ['dn', 'givenname', 'sn', 'uid', 'cn'], 1)
             members = members[1:]
             members.sort(self.sort_group_member)
 
@@ -216,6 +216,20 @@ class GroupController(IPAController):
             # (so we don't have to do this on each round trip)
             member_dicts = map(lambda member: member.toDict(), members)
 
+            indirect_members = client.group_members(group.dn, ['dn', 'givenname', 'sn', 'uid', 'cn'], 2)
+            indirect_members = indirect_members[1:]
+            indirect_members.sort(self.sort_group_member)
+
+            # add our own flag
+            for i in range(len(indirect_members)):
+                indirect_members[i].setValue('inherited', True)
+
+            # Map users into an array of dicts, which can be serialized
+            # (so we don't have to do this on each round trip)
+            indirect_members_dicts = map(lambda member: member.toDict(), indirect_members)
+
+            member_dicts = member_dicts + indirect_members_dicts
+
             # store a copy of the original group for the update later
             group_data = b64encode(dumps(group_dict))
             member_data = b64encode(dumps(member_dicts))
@@ -411,11 +425,26 @@ class GroupController(IPAController):
             # convert members to users, for display on the page
             #
 
-            members = client.group_members(group.dn, ['dn', 'givenname', 'sn', 'uid', 'cn'])
+            members = client.group_members(group.dn, ['dn', 'givenname', 'sn', 'uid', 'cn'], 1)
             members = members[1:]
             members.sort(self.sort_group_member)
             member_dicts = map(lambda member: member.toDict(), members)
 
+            indirect_members = client.group_members(group.dn, ['dn', 'givenname', 'sn', 'uid', 'cn'], 2)
+            indirect_members = indirect_members[1:]
+            indirect_members.sort(self.sort_group_member)
+
+            # add our own flag
+            for i in range(len(indirect_members)):
+                indirect_members[i].setValue('inherited', True)
+
+            # Map users into an array of dicts, which can be serialized
+            # (so we don't have to do this on each round trip)
+            indirect_members_dicts = map(lambda member: member.toDict(), indirect_members)
+
+            member_dicts = member_dicts + indirect_members_dicts
+            logging.info("%s" % member_dicts)
+
             return dict(group=group_dict, fields=ipagui.forms.group.GroupFields(),
                     members = member_dicts)
         except ipaerror.IPAError, e: