From 0188158a766cb019f881debde84e73aa1363170a Mon Sep 17 00:00:00 2001 From: Rob Crittenden Date: Wed, 2 Feb 2011 14:16:27 -0500 Subject: Use correct LDAP attributes for city and state. Also add a unit test for address. Ticket 889 --- ipalib/plugins/user.py | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) (limited to 'ipalib/plugins') diff --git a/ipalib/plugins/user.py b/ipalib/plugins/user.py index 749a9adca..12e17131f 100644 --- a/ipalib/plugins/user.py +++ b/ipalib/plugins/user.py @@ -170,11 +170,12 @@ class user(LDAPObject): cli_name='street', label=_('Street address'), ), - Str('location?', + Str('locality?', cli_name='city', label=_('City'), ), - Str('state?', + Str('st?', + cli_name='state', label=_('State'), ), Int('postalcode?', @@ -182,11 +183,14 @@ class user(LDAPObject): ), Str('telephonenumber*', cli_name='phone', - label=_('Telephone Number') ), + label=_('Telephone Number') + ), Str('mobile*', - label=_('Mobile Telephone Number') ), + label=_('Mobile Telephone Number') + ), Str('pager*', - label=_('Pager Number') ), + label=_('Pager Number') + ), Str('facsimiletelephonenumber*', cli_name='fax', label=_('Fax Number'), -- cgit