diff options
| author | Karl MacMillan <kmacmill@redhat.com> | 2007-10-09 16:26:21 -0400 |
|---|---|---|
| committer | Karl MacMillan <kmacmill@redhat.com> | 2007-10-09 16:26:21 -0400 |
| commit | f25e7c46efe71e53eb98548392549ec542fa271e (patch) | |
| tree | bad7d7b45446cc62d845c5d04b1d50ad740ca843 /ipa-server/ipa-gui/ipagui/subcontrollers/group.py | |
| parent | d2a19b200912fe4a78211a3d6212b143ece5e064 (diff) | |
| parent | 2b38769b50b51d28111a07be86d9fc70e5b6b8f5 (diff) | |
| download | freeipa.git-f25e7c46efe71e53eb98548392549ec542fa271e.tar.gz freeipa.git-f25e7c46efe71e53eb98548392549ec542fa271e.tar.xz freeipa.git-f25e7c46efe71e53eb98548392549ec542fa271e.zip | |
Merge.
Diffstat (limited to 'ipa-server/ipa-gui/ipagui/subcontrollers/group.py')
| -rw-r--r-- | ipa-server/ipa-gui/ipagui/subcontrollers/group.py | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/ipa-server/ipa-gui/ipagui/subcontrollers/group.py b/ipa-server/ipa-gui/ipagui/subcontrollers/group.py index 9a54f91f..1050a559 100644 --- a/ipa-server/ipa-gui/ipagui/subcontrollers/group.py +++ b/ipa-server/ipa-gui/ipagui/subcontrollers/group.py @@ -84,7 +84,7 @@ class GroupController(IPAController): # on any error, we redirect to the _edit_ group page. # this code does data setup, similar to groupedit() # - group = client.get_group_by_cn(kw['cn'], group_fields) + group = client.get_entry_by_cn(kw['cn'], group_fields) group_dict = group.toDict() member_dicts = [] @@ -169,7 +169,7 @@ class GroupController(IPAController): client = self.get_ipaclient() try: - group = client.get_group_by_cn(cn, group_fields) + group = client.get_entry_by_cn(cn, group_fields) group_dict = group.toDict() @@ -186,9 +186,8 @@ class GroupController(IPAController): member_dns = [member_dns] # TODO: convert this into an efficient (single) function call - # Note: this isn't quite right, since it can be users and groups. members = map( - lambda dn: client.get_user_by_dn(dn, ['dn', 'givenname', 'sn', + lambda dn: client.get_entry_by_dn(dn, ['dn', 'givenname', 'sn', 'uid', 'cn']), member_dns) members.sort(self.sort_group_member) @@ -346,7 +345,7 @@ class GroupController(IPAController): client = self.get_ipaclient() try: - group = client.get_group_by_cn(cn, group_fields) + group = client.get_entry_by_cn(cn, group_fields) group_dict = group.toDict() # @@ -359,9 +358,8 @@ class GroupController(IPAController): member_dns = [member_dns] # TODO: convert this into an efficient (single) function call - # Note: this isn't quite right, since it can be users and groups. members = map( - lambda dn: client.get_user_by_dn(dn, ['dn', 'givenname', 'sn', + lambda dn: client.get_entry_by_dn(dn, ['dn', 'givenname', 'sn', 'uid', 'cn']), member_dns) members.sort(self.sort_group_member) |