openstack/horizon
Code Issues Proposed changes

Merge "Update default_project param on create user"

Browse Source
This commit is contained in:
Jenkins 2015-09-14 10:54:48 +00:00 committed by Gerrit Code Review
commit 749e436c63
2 changed files with 10 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
openstack_dashboard/api/keystone.py
View File

@ -329,7 +329,7 @@ def user_create(request, name=None, email=None, password=None, project=None,
return VERSIONS.upgrade_v2_user(user)
else:
return manager.create(name, password=password, email=email,
project=project, enabled=enabled,
default_project=project, enabled=enabled,
domain=domain, description=description)
except keystone_exceptions.Conflict:
raise exceptions.Conflict()

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

@ -147,14 +147,15 @@ class CreateUserForm(PasswordMixin, BaseUserForm):
desc = data["description"]
if "email" in data:
data['email'] = data['email'] or None
new_user = api.keystone.user_create(request,
name=data['name'],
email=data['email'],
description=desc,
password=data['password'],
project=data['project'],
enabled=data['enabled'],
domain=domain.id)
new_user = \
api.keystone.user_create(request,
name=data['name'],
email=data['email'],
description=desc,
password=data['password'],
project=data['project'] or None,
enabled=data['enabled'],
domain=domain.id)
messages.success(request,
_('User "%s" was successfully created.')
% data['name'])