summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEndi S. Dewata <edewata@redhat.com>2010-11-19 18:30:03 -0600
committerEndi Sukma Dewata <edewata@redhat.com>2010-11-20 02:31:40 -0500
commit3e540272c69c9697a52a0e2d04ed3c2ae93740f4 (patch)
tree01f2a59120df62a4fdadbf504ddcce0c71956818
parent5d5ec15ee5183b3ee5d67fef34877d55874e9e14 (diff)
downloadfreeipa-3e540272c69c9697a52a0e2d04ed3c2ae93740f4.tar.gz
freeipa-3e540272c69c9697a52a0e2d04ed3c2ae93740f4.tar.xz
freeipa-3e540272c69c9697a52a0e2d04ed3c2ae93740f4.zip
Multivalued email address
-rw-r--r--install/static/test/data/ipa_init.json2
-rw-r--r--install/static/test/data/json_metadata.json2
-rw-r--r--ipalib/plugins/user.py2
3 files changed, 3 insertions, 3 deletions
diff --git a/install/static/test/data/ipa_init.json b/install/static/test/data/ipa_init.json
index a38cd9767..84fc02cc0 100644
--- a/install/static/test/data/ipa_init.json
+++ b/install/static/test/data/ipa_init.json
@@ -3876,7 +3876,7 @@
"length": null,
"maxlength": null,
"minlength": null,
- "multivalue": false,
+ "multivalue": true,
"name": "mail",
"pattern": null,
"pattern_errmsg": null,
diff --git a/install/static/test/data/json_metadata.json b/install/static/test/data/json_metadata.json
index 372b9de54..4ebe489cf 100644
--- a/install/static/test/data/json_metadata.json
+++ b/install/static/test/data/json_metadata.json
@@ -3872,7 +3872,7 @@
"length": null,
"maxlength": null,
"minlength": null,
- "multivalue": false,
+ "multivalue": true,
"name": "mail",
"pattern": null,
"pattern_errmsg": null,
diff --git a/ipalib/plugins/user.py b/ipalib/plugins/user.py
index 405543bbd..b34ba99f9 100644
--- a/ipalib/plugins/user.py
+++ b/ipalib/plugins/user.py
@@ -116,7 +116,7 @@ class user(LDAPObject):
default_from=lambda uid: '%s@%s' % (uid, api.env.realm),
autofill=True,
),
- Str('mail?',
+ Str('mail*',
cli_name='email',
label=_('Email address'),
),