Change default gecos from uid to first and last name.

ticket 1146
This commit is contained in:
Rob Crittenden
2011-04-01 15:53:56 -04:00
parent e3a76d435e
commit deaf029023
8 changed files with 16 additions and 16 deletions

View File

@@ -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(<lambda>, '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(<lambda>, 'givenname', 'sn'), label=Gettext('Initials', domain='ipa', localedir=None), multivalue=False, required=False)
option: Str('homedirectory', attribute=True, cli_name='homedir', default_from=DefaultFrom(<lambda>, '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(<lambda>, '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(<lambda>, '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(<lambda>, '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(<lambda>, '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(<lambda>, '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(<lambda>, '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(<lambda>, '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(<lambda>, '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(<lambda>, '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(<lambda>, '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(<lambda>, '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(<lambda>, '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(<lambda>, '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(<lambda>, '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)

View File

@@ -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?',

View File

@@ -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],

View File

@@ -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)],

View File

@@ -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],

View File

@@ -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)],

View File

@@ -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],

View File

@@ -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],