diff options
author | Rob Crittenden <rcritten@redhat.com> | 2011-04-05 17:26:35 -0400 |
---|---|---|
committer | Rob Crittenden <rcritten@redhat.com> | 2011-04-05 21:51:34 -0400 |
commit | 316efbc32f7b586df36653aa894e686313a64764 (patch) | |
tree | e04c75afc91ccec0a576f49e4aae38d2d4daa558 | |
parent | b9a2c11d6f6be6e7e599a48c70e798b720222b35 (diff) | |
download | freeipa-316efbc32f7b586df36653aa894e686313a64764.tar.gz freeipa-316efbc32f7b586df36653aa894e686313a64764.tar.xz freeipa-316efbc32f7b586df36653aa894e686313a64764.zip |
postalCode should be a string not an integer.
postalCode is defined as an Int. This means you can't define one that has
a leading zero nor can you have dashes, letters, etc.
This changes the data type on the server. It will still accept an int
value if provided and convert it into a string.
Bump the API version to 2.1.
ticket 1150
-rw-r--r-- | API.txt | 6 | ||||
-rw-r--r-- | VERSION | 2 | ||||
-rw-r--r-- | ipalib/plugins/user.py | 2 | ||||
-rw-r--r-- | tests/test_xmlrpc/test_user_plugin.py | 3 |
4 files changed, 7 insertions, 6 deletions
@@ -2542,7 +2542,7 @@ option: Int('gidnumber', attribute=True, cli_name='gidnumber', default_from=Defa option: Str('street', attribute=True, cli_name='street', label=Gettext('Street address', domain='ipa', localedir=None), multivalue=False, required=False) option: Str('l', attribute=True, cli_name='city', label=Gettext('City', domain='ipa', localedir=None), multivalue=False, required=False) option: Str('st', attribute=True, cli_name='state', label=Gettext('State/Province', domain='ipa', localedir=None), multivalue=False, required=False) -option: Int('postalcode', attribute=True, cli_name='postalcode', label=Gettext('ZIP', domain='ipa', localedir=None), multivalue=False, required=False) +option: Str('postalcode', attribute=True, cli_name='postalcode', label=Gettext('ZIP', domain='ipa', localedir=None), multivalue=False, required=False) option: Str('telephonenumber', attribute=True, cli_name='phone', label=Gettext('Telephone Number', domain='ipa', localedir=None), multivalue=True, required=False) option: Str('mobile', attribute=True, cli_name='mobile', label=Gettext('Mobile Telephone Number', domain='ipa', localedir=None), multivalue=True, required=False) option: Str('pager', attribute=True, cli_name='pager', label=Gettext('Pager Number', domain='ipa', localedir=None), multivalue=True, required=False) @@ -2598,7 +2598,7 @@ option: Int('gidnumber', attribute=True, autofill=False, cli_name='gidnumber', d option: Str('street', attribute=True, autofill=False, cli_name='street', label=Gettext('Street address', domain='ipa', localedir=None), multivalue=False, query=True, required=False) option: Str('l', attribute=True, autofill=False, cli_name='city', label=Gettext('City', domain='ipa', localedir=None), multivalue=False, query=True, required=False) option: Str('st', attribute=True, autofill=False, cli_name='state', label=Gettext('State/Province', domain='ipa', localedir=None), multivalue=False, query=True, required=False) -option: Int('postalcode', attribute=True, autofill=False, cli_name='postalcode', label=Gettext('ZIP', domain='ipa', localedir=None), multivalue=False, query=True, required=False) +option: Str('postalcode', attribute=True, autofill=False, cli_name='postalcode', label=Gettext('ZIP', domain='ipa', localedir=None), multivalue=False, query=True, required=False) option: Str('telephonenumber', attribute=True, autofill=False, cli_name='phone', label=Gettext('Telephone Number', domain='ipa', localedir=None), multivalue=True, query=True, required=False) option: Str('mobile', attribute=True, autofill=False, cli_name='mobile', label=Gettext('Mobile Telephone Number', domain='ipa', localedir=None), multivalue=True, query=True, required=False) option: Str('pager', attribute=True, autofill=False, cli_name='pager', label=Gettext('Pager Number', domain='ipa', localedir=None), multivalue=True, query=True, required=False) @@ -2641,7 +2641,7 @@ option: Int('gidnumber', attribute=True, autofill=False, cli_name='gidnumber', d option: Str('street', attribute=True, autofill=False, cli_name='street', label=Gettext('Street address', domain='ipa', localedir=None), multivalue=False, required=False) option: Str('l', attribute=True, autofill=False, cli_name='city', label=Gettext('City', domain='ipa', localedir=None), multivalue=False, required=False) option: Str('st', attribute=True, autofill=False, cli_name='state', label=Gettext('State/Province', domain='ipa', localedir=None), multivalue=False, required=False) -option: Int('postalcode', attribute=True, autofill=False, cli_name='postalcode', label=Gettext('ZIP', domain='ipa', localedir=None), multivalue=False, required=False) +option: Str('postalcode', attribute=True, autofill=False, cli_name='postalcode', label=Gettext('ZIP', domain='ipa', localedir=None), multivalue=False, required=False) option: Str('telephonenumber', attribute=True, autofill=False, cli_name='phone', label=Gettext('Telephone Number', domain='ipa', localedir=None), multivalue=True, required=False) option: Str('mobile', attribute=True, autofill=False, cli_name='mobile', label=Gettext('Mobile Telephone Number', domain='ipa', localedir=None), multivalue=True, required=False) option: Str('pager', attribute=True, autofill=False, cli_name='pager', label=Gettext('Pager Number', domain='ipa', localedir=None), multivalue=True, required=False) @@ -79,4 +79,4 @@ IPA_DATA_VERSION=20100614120000 # # ######################################################## IPA_API_VERSION_MAJOR=2 -IPA_API_VERSION_MINOR=0 +IPA_API_VERSION_MINOR=1 diff --git a/ipalib/plugins/user.py b/ipalib/plugins/user.py index 0f6fb5870..901514466 100644 --- a/ipalib/plugins/user.py +++ b/ipalib/plugins/user.py @@ -189,7 +189,7 @@ class user(LDAPObject): cli_name='state', label=_('State/Province'), ), - Int('postalcode?', + Str('postalcode?', label=_('ZIP'), ), Str('telephonenumber*', diff --git a/tests/test_xmlrpc/test_user_plugin.py b/tests/test_xmlrpc/test_user_plugin.py index 73cb29574..00f906076 100644 --- a/tests/test_xmlrpc/test_user_plugin.py +++ b/tests/test_xmlrpc/test_user_plugin.py @@ -511,7 +511,7 @@ class test_user(Declarative): command=( 'user_add', [user1], dict(givenname=u'Test', sn=u'User1', street=u'123 Maple Rd', l=u'Anytown', st=u'MD', - telephonenumber=u'410-555-1212',) + telephonenumber=u'410-555-1212', postalcode=u'01234-5678') ), expected=dict( value=user1, @@ -532,6 +532,7 @@ class test_user(Declarative): street=[u'123 Maple Rd'], l=[u'Anytown'], st=[u'MD'], + postalcode=[u'01234-5678'], telephonenumber=[u'410-555-1212'], ipauniqueid=[fuzzy_uuid], dn=u'uid=tuser1,cn=users,cn=accounts,' + api.env.basedn, |