summaryrefslogtreecommitdiffstats
path: root/ipalib
diff options
context:
space:
mode:
authorRob Crittenden <rcritten@redhat.com>2011-02-02 14:16:27 -0500
committerAdam Young <ayoung@redhat.com>2011-02-02 16:53:32 -0500
commit0188158a766cb019f881debde84e73aa1363170a (patch)
treede4085f5f2bcc9174e100084cefe04462c578b92 /ipalib
parentd389e054f6173194daabc08ad3abd366005048bd (diff)
downloadfreeipa-0188158a766cb019f881debde84e73aa1363170a.tar.gz
freeipa-0188158a766cb019f881debde84e73aa1363170a.tar.xz
freeipa-0188158a766cb019f881debde84e73aa1363170a.zip
Use correct LDAP attributes for city and state.
Also add a unit test for address. Ticket 889
Diffstat (limited to 'ipalib')
-rw-r--r--ipalib/plugins/user.py14
1 files changed, 9 insertions, 5 deletions
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'),