diff options
| author | Rob Crittenden <rcritten@redhat.com> | 2011-04-22 13:43:30 -0400 |
|---|---|---|
| committer | Adam Young <ayoung@redhat.com> | 2011-04-22 14:49:20 -0400 |
| commit | d3b0c64fcec9a97626dbaca238a0186f180fe2fd (patch) | |
| tree | 625b972b9945d89731ca7cb4a0c8b39dea08a39a /ipalib/plugins | |
| parent | f746121824c58c1d21d94ae4f2afd8893be9e1dd (diff) | |
| download | freeipa-d3b0c64fcec9a97626dbaca238a0186f180fe2fd.tar.gz freeipa-d3b0c64fcec9a97626dbaca238a0186f180fe2fd.tar.xz freeipa-d3b0c64fcec9a97626dbaca238a0186f180fe2fd.zip | |
Modify the default attributes shown in user-find to match the UI design.
This change means the UI can stop using the --all option and have to
retrieve significantly less information from the server. It also
speeds up user-find as it doesn't have to calculate membership.
This adds a new baseclass parameter, search_display_attributes, which
can provide a separate list from default_attributes just for find
commands.
The UI will need to be changed to switch from using cn to using
givenname and sn.
ticket 1136
Diffstat (limited to 'ipalib/plugins')
| -rw-r--r-- | ipalib/plugins/baseldap.py | 9 | ||||
| -rw-r--r-- | ipalib/plugins/user.py | 5 |
2 files changed, 12 insertions, 2 deletions
diff --git a/ipalib/plugins/baseldap.py b/ipalib/plugins/baseldap.py index 044e00e08..4b80c6d06 100644 --- a/ipalib/plugins/baseldap.py +++ b/ipalib/plugins/baseldap.py @@ -256,6 +256,7 @@ class LDAPObject(Object): search_attributes = [] search_attributes_config = None default_attributes = [] + search_display_attributes = [] # attributes displayed in LDAPSearch hidden_attributes = ['objectclass', 'aci'] # set rdn_attribute only if RDN attribute differs from primary key! rdn_attribute = '' @@ -1362,11 +1363,15 @@ class LDAPSearch(CallbackInterface, crud.Search): search_kw = self.args_options_2_entry(**options) + if self.obj.search_display_attributes: + defattrs = self.obj.search_display_attributes + else: + defattrs = self.obj.default_attributes if options.get('all', False): - attrs_list = ['*'] + self.obj.default_attributes + attrs_list = ['*'] + defattrs else: attrs_list = list( - set(self.obj.default_attributes + search_kw.keys()) + set(defattrs + search_kw.keys()) ) if self.obj.search_attributes: diff --git a/ipalib/plugins/user.py b/ipalib/plugins/user.py index efd9e278a..a058ff7ed 100644 --- a/ipalib/plugins/user.py +++ b/ipalib/plugins/user.py @@ -86,6 +86,11 @@ class user(LDAPObject): 'telephonenumber', 'title', 'memberof', 'nsaccountlock', 'memberofindirect', ] + search_display_attributes = [ + 'uid', 'givenname', 'sn', 'homedirectory', 'loginshell', + 'mail', 'telephonenumber', 'title', 'nsaccountlock', + 'uidnumber', 'gidnumber', + ] uuid_attribute = 'ipauniqueid' attribute_members = { 'memberof': ['group', 'netgroup', 'role'], |