openstack/horizon
Code Issues Proposed changes

Merge "Fix cannot delete user's email addresses in the identity/user panel"

Browse Source
This commit is contained in:
Jenkins 2017-08-16 04:51:38 +00:00 committed by Gerrit Code Review
commit f75168e5e6
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -259,7 +259,7 @@ class UpdateUserForm(BaseUserForm, AddExtraColumnMixIn):
data.pop('description')
try:
if "email" in data:
data['email'] = data['email'] or None
data['email'] = data['email']
response = api.keystone.user_update(request, user, **data)
messages.success(request,
_('User has been updated successfully.'))

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

@ -500,7 +500,7 @@ class UsersViewTests(test.BaseAdminViewTests):
api.keystone.user_update(IsA(http.HttpRequest),
user.id,
email=user.email,
email=user.email or "",
name=user.name,
project=self.tenant.id).AndReturn(None)