From deaf029023e4037ad53d17b9e48562845b3c1197 Mon Sep 17 00:00:00 2001 From: Rob Crittenden Date: Fri, 1 Apr 2011 15:53:56 -0400 Subject: Change default gecos from uid to first and last name. ticket 1146 --- API.txt | 6 +++--- ipalib/plugins/user.py | 2 +- tests/test_xmlrpc/test_attr.py | 2 +- tests/test_xmlrpc/test_group_plugin.py | 2 +- tests/test_xmlrpc/test_nesting.py | 4 ++-- tests/test_xmlrpc/test_netgroup_plugin.py | 4 ++-- tests/test_xmlrpc/test_replace.py | 2 +- tests/test_xmlrpc/test_user_plugin.py | 10 +++++----- 8 files changed, 16 insertions(+), 16 deletions(-) diff --git a/API.txt b/API.txt index 12ed508e7..54193e739 100644 --- a/API.txt +++ b/API.txt @@ -2532,7 +2532,7 @@ option: Str('cn', attribute=True, autofill=True, cli_name='cn', default_from=Def option: Str('displayname', attribute=True, autofill=True, cli_name='displayname', default_from=DefaultFrom(, 'givenname', 'sn'), label=Gettext('Display name', domain='ipa', localedir=None), multivalue=False, required=False) option: Str('initials', attribute=True, autofill=True, cli_name='initials', default_from=DefaultFrom(, 'givenname', 'sn'), label=Gettext('Initials', domain='ipa', localedir=None), multivalue=False, required=False) option: Str('homedirectory', attribute=True, cli_name='homedir', default_from=DefaultFrom(, 'uid'), label=Gettext('Home directory', domain='ipa', localedir=None), multivalue=False, required=False) -option: Str('gecos', attribute=True, autofill=True, cli_name='gecos', default_from=DefaultFrom(, 'uid'), label=Gettext('GECOS field', domain='ipa', localedir=None), multivalue=False, required=False) +option: Str('gecos', attribute=True, autofill=True, cli_name='gecos', default_from=DefaultFrom(, 'givenname', 'sn'), label=Gettext('GECOS field', domain='ipa', localedir=None), multivalue=False, required=False) option: Str('loginshell', attribute=True, cli_name='shell', default=u'/bin/sh', label=Gettext('Login shell', domain='ipa', localedir=None), multivalue=False, required=False) option: Str('krbprincipalname', attribute=True, autofill=True, cli_name='principal', default_from=DefaultFrom(, 'uid'), flags=['no_update'], label=Gettext('Kerberos principal', domain='ipa', localedir=None), multivalue=False, required=False) option: Str('mail', attribute=True, cli_name='email', label=Gettext('Email address', domain='ipa', localedir=None), multivalue=True, required=False) @@ -2588,7 +2588,7 @@ option: Str('cn', attribute=True, autofill=False, cli_name='cn', default_from=De option: Str('displayname', attribute=True, autofill=False, cli_name='displayname', default_from=DefaultFrom(, 'givenname', 'sn'), label=Gettext('Display name', domain='ipa', localedir=None), multivalue=False, query=True, required=False) option: Str('initials', attribute=True, autofill=False, cli_name='initials', default_from=DefaultFrom(, 'givenname', 'sn'), label=Gettext('Initials', domain='ipa', localedir=None), multivalue=False, query=True, required=False) option: Str('homedirectory', attribute=True, autofill=False, cli_name='homedir', default_from=DefaultFrom(, 'uid'), label=Gettext('Home directory', domain='ipa', localedir=None), multivalue=False, query=True, required=False) -option: Str('gecos', attribute=True, autofill=False, cli_name='gecos', default_from=DefaultFrom(, 'uid'), label=Gettext('GECOS field', domain='ipa', localedir=None), multivalue=False, query=True, required=False) +option: Str('gecos', attribute=True, autofill=False, cli_name='gecos', default_from=DefaultFrom(, 'givenname', 'sn'), label=Gettext('GECOS field', domain='ipa', localedir=None), multivalue=False, query=True, required=False) option: Str('loginshell', attribute=True, autofill=False, cli_name='shell', default=u'/bin/sh', label=Gettext('Login shell', domain='ipa', localedir=None), multivalue=False, query=True, required=False) option: Str('krbprincipalname', attribute=True, autofill=False, cli_name='principal', default_from=DefaultFrom(, 'uid'), flags=['no_update'], label=Gettext('Kerberos principal', domain='ipa', localedir=None), multivalue=False, query=True, required=False) option: Str('mail', attribute=True, autofill=False, cli_name='email', label=Gettext('Email address', domain='ipa', localedir=None), multivalue=True, query=True, required=False) @@ -2632,7 +2632,7 @@ option: Str('cn', attribute=True, autofill=False, cli_name='cn', default_from=De option: Str('displayname', attribute=True, autofill=False, cli_name='displayname', default_from=DefaultFrom(, 'givenname', 'sn'), label=Gettext('Display name', domain='ipa', localedir=None), multivalue=False, required=False) option: Str('initials', attribute=True, autofill=False, cli_name='initials', default_from=DefaultFrom(, 'givenname', 'sn'), label=Gettext('Initials', domain='ipa', localedir=None), multivalue=False, required=False) option: Str('homedirectory', attribute=True, autofill=False, cli_name='homedir', default_from=DefaultFrom(, 'uid'), label=Gettext('Home directory', domain='ipa', localedir=None), multivalue=False, required=False) -option: Str('gecos', attribute=True, autofill=False, cli_name='gecos', default_from=DefaultFrom(, 'uid'), label=Gettext('GECOS field', domain='ipa', localedir=None), multivalue=False, required=False) +option: Str('gecos', attribute=True, autofill=False, cli_name='gecos', default_from=DefaultFrom(, 'givenname', 'sn'), label=Gettext('GECOS field', domain='ipa', localedir=None), multivalue=False, required=False) option: Str('loginshell', attribute=True, autofill=False, cli_name='shell', default=u'/bin/sh', label=Gettext('Login shell', domain='ipa', localedir=None), multivalue=False, required=False) option: Str('mail', attribute=True, autofill=False, cli_name='email', label=Gettext('Email address', domain='ipa', localedir=None), multivalue=True, required=False) option: Password('userpassword', attribute=True, autofill=False, cli_name='password', exclude='webui', label=Gettext('Password', domain='ipa', localedir=None), multivalue=False, required=False) diff --git a/ipalib/plugins/user.py b/ipalib/plugins/user.py index 891a73a87..0f6fb5870 100644 --- a/ipalib/plugins/user.py +++ b/ipalib/plugins/user.py @@ -137,7 +137,7 @@ class user(LDAPObject): ), Str('gecos?', label=_('GECOS field'), - default_from=lambda uid: uid, + default_from=lambda givenname, sn: '%s %s' % (givenname, sn), autofill=True, ), Str('loginshell?', diff --git a/tests/test_xmlrpc/test_attr.py b/tests/test_xmlrpc/test_attr.py index 125b9b3f0..5ca1f47b5 100644 --- a/tests/test_xmlrpc/test_attr.py +++ b/tests/test_xmlrpc/test_attr.py @@ -47,7 +47,7 @@ class test_attr(Declarative): value=user1, summary=u'Added user "tuser1"', result=dict( - gecos=[user1], + gecos=[u'Test User1'], givenname=[u'Test'], homedirectory=[u'/home/tuser1'], krbprincipalname=[u'tuser1@' + api.env.realm], diff --git a/tests/test_xmlrpc/test_group_plugin.py b/tests/test_xmlrpc/test_group_plugin.py index 5b2584b9c..5cb94f34a 100644 --- a/tests/test_xmlrpc/test_group_plugin.py +++ b/tests/test_xmlrpc/test_group_plugin.py @@ -576,7 +576,7 @@ class test_group(Declarative): value=user1, summary=u'Added user "%s"' % user1, result=dict( - gecos=[user1], + gecos=[u'Test User1'], givenname=[u'Test'], homedirectory=[u'/home/%s' % user1], krbprincipalname=[u'%s@%s' % (user1, api.env.realm)], diff --git a/tests/test_xmlrpc/test_nesting.py b/tests/test_xmlrpc/test_nesting.py index 9ccb136a8..d28535015 100644 --- a/tests/test_xmlrpc/test_nesting.py +++ b/tests/test_xmlrpc/test_nesting.py @@ -127,7 +127,7 @@ class test_group(Declarative): value=user1, summary=u'Added user "%s"' % user1, result=dict( - gecos=[user1], + gecos=[u'Test User1'], givenname=[u'Test'], homedirectory=[u'/home/tuser1'], krbprincipalname=[u'tuser1@' + api.env.realm], @@ -155,7 +155,7 @@ class test_group(Declarative): value=user2, summary=u'Added user "%s"' % user2, result=dict( - gecos=[user2], + gecos=[u'Test User2'], givenname=[u'Test'], homedirectory=[u'/home/tuser2'], krbprincipalname=[u'tuser2@' + api.env.realm], diff --git a/tests/test_xmlrpc/test_netgroup_plugin.py b/tests/test_xmlrpc/test_netgroup_plugin.py index 5e73d0ed3..35cc17dff 100644 --- a/tests/test_xmlrpc/test_netgroup_plugin.py +++ b/tests/test_xmlrpc/test_netgroup_plugin.py @@ -198,7 +198,7 @@ class test_netgroup(Declarative): value=user1, summary=u'Added user "%s"' % user1, result=dict( - gecos=[user1], + gecos=[u'Test User1'], givenname=[u'Test'], homedirectory=[u'/home/%s' % user1], krbprincipalname=[u'%s@%s' % (user1, api.env.realm)], @@ -225,7 +225,7 @@ class test_netgroup(Declarative): value=user2, summary=u'Added user "%s"' % user2, result=dict( - gecos=[user2], + gecos=[u'Test User2'], givenname=[u'Test'], homedirectory=[u'/home/%s' % user2], krbprincipalname=[u'%s@%s' % (user2, api.env.realm)], diff --git a/tests/test_xmlrpc/test_replace.py b/tests/test_xmlrpc/test_replace.py index 715a8661c..9305f21cd 100644 --- a/tests/test_xmlrpc/test_replace.py +++ b/tests/test_xmlrpc/test_replace.py @@ -52,7 +52,7 @@ class test_attr(Declarative): value=user1, summary=u'Added user "tuser1"', result=dict( - gecos=[user1], + gecos=[u'Test User1'], givenname=[u'Test'], homedirectory=[u'/home/tuser1'], krbprincipalname=[u'tuser1@' + api.env.realm], diff --git a/tests/test_xmlrpc/test_user_plugin.py b/tests/test_xmlrpc/test_user_plugin.py index cacf1077f..73cb29574 100644 --- a/tests/test_xmlrpc/test_user_plugin.py +++ b/tests/test_xmlrpc/test_user_plugin.py @@ -84,7 +84,7 @@ class test_user(Declarative): value=user1, summary=u'Added user "tuser1"', result=dict( - gecos=[user1], + gecos=[u'Test User1'], givenname=[u'Test'], homedirectory=[u'/home/tuser1'], krbprincipalname=[u'tuser1@' + api.env.realm], @@ -144,7 +144,7 @@ class test_user(Declarative): { 'dn': u'uid=tuser1,cn=users,cn=accounts,' + api.env.basedn, 'cn': [u'Test User1'], - 'gecos': [user1], + 'gecos': [u'Test User1'], 'givenname': [u'Test'], 'homedirectory': [u'/home/tuser1'], 'krbprincipalname': [u'tuser1@' + api.env.realm], @@ -393,7 +393,7 @@ class test_user(Declarative): value=user1, summary=u'Added user "tuser1"', result=dict( - gecos=[user1], + gecos=[u'Test User1'], givenname=[u'Test'], homedirectory=[u'/home/tuser1'], krbprincipalname=[u'tuser1@' + api.env.realm], @@ -421,7 +421,7 @@ class test_user(Declarative): value=user2, summary=u'Added user "tuser2"', result=dict( - gecos=[user2], + gecos=[u'Test User2'], givenname=[u'Test'], homedirectory=[u'/home/tuser2'], krbprincipalname=[u'tuser2@' + api.env.realm], @@ -517,7 +517,7 @@ class test_user(Declarative): value=user1, summary=u'Added user "tuser1"', result=dict( - gecos=[user1], + gecos=[u'Test User1'], givenname=[u'Test'], homedirectory=[u'/home/tuser1'], krbprincipalname=[u'tuser1@' + api.env.realm], -- cgit