Andal.LND/edx-platform
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #5714 from edx/will/logistration-email-field

Browse Source 
Change field type for email from 'text' to 'email'
This commit is contained in:
Will Daly
2014-10-24 09:28:55 -04:00
parent b14a129132 611e819d17
commit 56d55608c1
3 changed files with 7 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
common/djangoapps/user_api/helpers.py
View File

@@ -95,11 +95,12 @@ class InvalidFieldError(Exception):
class FormDescription(object):
"""Generate a JSON representation of a form. """
ALLOWED_TYPES = ["text", "select", "textarea", "checkbox", "password"]
ALLOWED_TYPES = ["text", "email", "select", "textarea", "checkbox", "password"]
ALLOWED_RESTRICTIONS = {
"text": ["min_length", "max_length"],
"password": ["min_length", "max_length"],
"email": ["min_length", "max_length"],
}
OVERRIDE_FIELD_PROPERTIES = [

6
common/djangoapps/user_api/tests/test_views.py
View File

@@ -600,7 +600,7 @@ class LoginSessionViewTest(ApiTestCase):
{
"name": "email",
"defaultValue": "",
"type": "text",
"type": "email",
"required": True,
"label": "E-mail",
"placeholder": "example: username@domain.com",
@@ -763,7 +763,7 @@ class RegistrationViewTest(ApiTestCase):
{
u"name": u"email",
u"defaultValue": u"",
u"type": u"text",
u"type": u"email",
u"required": True,
u"label": u"E-mail",
u"placeholder": u"example: username@domain.com",
@@ -854,7 +854,7 @@ class RegistrationViewTest(ApiTestCase):
{
u"name": u"email",
u"defaultValue": u"bob@example.com",
u"type": u"text",
u"type": u"email",
u"required": True,
u"label": u"E-mail",
u"placeholder": u"example: username@domain.com",

2
common/djangoapps/user_api/views.py
View File

@@ -75,6 +75,7 @@ class LoginSessionView(APIView):
form_desc.add_field(
"email",
field_type="email",
label=_(u"E-mail"),
placeholder=_(u"example: username@domain.com"),
instructions=_(
@@ -252,6 +253,7 @@ class RegistrationView(APIView):
def _add_email_field(self, form_desc, required=True):
form_desc.add_field(
"email",
field_type="email",
label=_(u"E-mail"),
placeholder=_(u"example: username@domain.com"),
instructions=_(