openstack/horizon
Code Issues Proposed changes

Added 'enabled' option in create user form

Browse Source 
In create user form, no way to set the user is disabled.
by default it is setting the user as enabled.

This patch adding the Boolean field to set enable and disable the user
at the time creating.

Change-Id: If4bf8ef077326658d4693858144904c7a93f1eb5
Closes-Bug: #1468208
This commit is contained in:
Masco Kaliyamoorthy 2015-06-24 12:48:38 +05:30
parent dd694cdef3
commit 3d9372a8c5
2 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
openstack_dashboard/dashboards/identity/users/forms.py
View File

@ -106,6 +106,9 @@ class CreateUserForm(PasswordMixin, BaseUserForm):
add_item_link=ADD_PROJECT_URL)
role_id = forms.ChoiceField(label=_("Role"),
required=PROJECT_REQUIRED)
enabled = forms.BooleanField(label=_("Enabled"),
required=False,
initial=True)
def __init__(self, *args, **kwargs):
roles = kwargs.pop('roles')
@ -113,7 +116,8 @@ class CreateUserForm(PasswordMixin, BaseUserForm):
# Reorder form fields from multiple inheritance
ordering = ["domain_id", "domain_name", "name",
"description", "email", "password",
"confirm_password", "project", "role_id"]
"confirm_password", "project", "role_id",
"enabled"]
# Starting from 1.7 Django uses OrderedDict for fields and keyOrder
# no longer works for it
if django.VERSION >= (1, 7):
@ -149,7 +153,7 @@ class CreateUserForm(PasswordMixin, BaseUserForm):
description=desc,
password=data['password'],
project=data['project'],
enabled=True,
enabled=data['enabled'],
domain=domain.id)
messages.success(request,
_('User "%s" was successfully created.')

2
openstack_dashboard/dashboards/identity/users/tests.py
View File

@ -120,6 +120,7 @@ class UsersViewTests(test.BaseAdminViewTests):
'password': user.password,
'project': self.tenant.id,
'role_id': self.roles.first().id,
'enabled': True,
'confirm_password': user.password}
res = self.client.post(USER_CREATE_URL, formData)
@ -170,6 +171,7 @@ class UsersViewTests(test.BaseAdminViewTests):
'name': user.name,
'description': user.description,
'email': "",
'enabled': True,
'password': user.password,
'project': self.tenant.id,
'role_id': self.roles.first().id,