summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2013-08-01 11:54:49 +0000
committerGerrit Code Review <review@openstack.org>2013-08-01 11:54:49 +0000
commitfe2554a7d69588e440945306249f43619a7dc205 (patch)
treedef724c9ce88b8eb84857c33bfc09509b19378c9
parent31b70669acb9a20df20607ce9ed1de22d249031d (diff)
parentc21f42ad7db2d65f46fa7011726481f0be0bea5f (diff)
downloadtuskar-ui-fe2554a7d69588e440945306249f43619a7dc205.tar.gz
Merge "Email field is made not mandatory in user creation and editing."
-rw-r--r--openstack_dashboard/dashboards/admin/users/forms.py8
1 files changed, 6 insertions, 2 deletions
diff --git a/openstack_dashboard/dashboards/admin/users/forms.py b/openstack_dashboard/dashboards/admin/users/forms.py
index e4ba02b0..c0039a3c 100644
--- a/openstack_dashboard/dashboards/admin/users/forms.py
+++ b/openstack_dashboard/dashboards/admin/users/forms.py
@@ -70,7 +70,9 @@ ADD_PROJECT_URL = "horizon:admin:projects:create"
class CreateUserForm(BaseUserForm):
name = forms.CharField(label=_("User Name"))
- email = forms.EmailField(label=_("Email"))
+ email = forms.EmailField(
+ label=_("Email"),
+ required=False)
password = forms.RegexField(
label=_("Password"),
widget=forms.PasswordInput(render_value=False),
@@ -125,7 +127,9 @@ class CreateUserForm(BaseUserForm):
class UpdateUserForm(BaseUserForm):
id = forms.CharField(label=_("ID"), widget=forms.HiddenInput)
name = forms.CharField(label=_("User Name"))
- email = forms.EmailField(label=_("Email"))
+ email = forms.EmailField(
+ label=_("Email"),
+ required=False)
password = forms.RegexField(
label=_("Password"),
widget=forms.PasswordInput(render_value=False),