diff options
| author | Kevin McCarthy <kmccarth@redhat.com> | 2007-10-09 09:26:16 -0700 |
|---|---|---|
| committer | Kevin McCarthy <kmccarth@redhat.com> | 2007-10-09 09:26:16 -0700 |
| commit | 2b38769b50b51d28111a07be86d9fc70e5b6b8f5 (patch) | |
| tree | 0eb02fb25e56a42b11f32ff83cde1f5337ae28ce /ipa-server/ipa-gui | |
| parent | aaa992b74405f41e2f51d1fb2946c57303c3de07 (diff) | |
| download | freeipa.git-2b38769b50b51d28111a07be86d9fc70e5b6b8f5.tar.gz freeipa.git-2b38769b50b51d28111a07be86d9fc70e5b6b8f5.tar.xz freeipa.git-2b38769b50b51d28111a07be86d9fc70e5b6b8f5.zip | |
Combine get_user/group by dn/cn into get_entry_by_cn/dn.
Also a couple double-escaping fixes I missed in the last patch.
Diffstat (limited to 'ipa-server/ipa-gui')
4 files changed, 8 insertions, 10 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) diff --git a/ipa-server/ipa-gui/ipagui/subcontrollers/user.py b/ipa-server/ipa-gui/ipagui/subcontrollers/user.py index 1603ac6d..d7ae4979 100644 --- a/ipa-server/ipa-gui/ipagui/subcontrollers/user.py +++ b/ipa-server/ipa-gui/ipagui/subcontrollers/user.py @@ -411,7 +411,7 @@ class UserController(IPAController): user_manager = None try: if user.manager: - user_manager = client.get_user_by_dn(user.manager, + user_manager = client.get_entry_by_dn(user.manager, ['givenname', 'sn', 'uid']) except ipaerror.exception_for(ipaerror.LDAP_NOT_FOUND): pass diff --git a/ipa-server/ipa-gui/ipagui/templates/usereditform.kid b/ipa-server/ipa-gui/ipagui/templates/usereditform.kid index 7c5bc0c2..1c5111be 100644 --- a/ipa-server/ipa-gui/ipagui/templates/usereditform.kid +++ b/ipa-server/ipa-gui/ipagui/templates/usereditform.kid @@ -65,7 +65,7 @@ from ipagui.helpers import ipahelper function renderMemberInfo(newdiv, info) { if (info.type == "group") { newdiv.appendChild(document.createTextNode( - info.name.escapeHTML() + " ")); + info.name + " ")); } } </script> diff --git a/ipa-server/ipa-gui/ipagui/templates/usernewform.kid b/ipa-server/ipa-gui/ipagui/templates/usernewform.kid index bb144c16..e13155f3 100644 --- a/ipa-server/ipa-gui/ipagui/templates/usernewform.kid +++ b/ipa-server/ipa-gui/ipagui/templates/usernewform.kid @@ -36,7 +36,7 @@ from ipagui.helpers import ipahelper function renderMemberInfo(newdiv, info) { if (info.type == "group") { newdiv.appendChild(document.createTextNode( - info.name.escapeHTML() + " ")); + info.name + " ")); } } </script> |