Merge "Update default_project param on create user"
This commit is contained in:
commit
749e436c63
openstack_dashboard
@ -329,7 +329,7 @@ def user_create(request, name=None, email=None, password=None, project=None,
|
|||||||
return VERSIONS.upgrade_v2_user(user)
|
return VERSIONS.upgrade_v2_user(user)
|
||||||
else:
|
else:
|
||||||
return manager.create(name, password=password, email=email,
|
return manager.create(name, password=password, email=email,
|
||||||
project=project, enabled=enabled,
|
default_project=project, enabled=enabled,
|
||||||
domain=domain, description=description)
|
domain=domain, description=description)
|
||||||
except keystone_exceptions.Conflict:
|
except keystone_exceptions.Conflict:
|
||||||
raise exceptions.Conflict()
|
raise exceptions.Conflict()
|
||||||
|
@ -147,14 +147,15 @@ class CreateUserForm(PasswordMixin, BaseUserForm):
|
|||||||
desc = data["description"]
|
desc = data["description"]
|
||||||
if "email" in data:
|
if "email" in data:
|
||||||
data['email'] = data['email'] or None
|
data['email'] = data['email'] or None
|
||||||
new_user = api.keystone.user_create(request,
|
new_user = \
|
||||||
name=data['name'],
|
api.keystone.user_create(request,
|
||||||
email=data['email'],
|
name=data['name'],
|
||||||
description=desc,
|
email=data['email'],
|
||||||
password=data['password'],
|
description=desc,
|
||||||
project=data['project'],
|
password=data['password'],
|
||||||
enabled=data['enabled'],
|
project=data['project'] or None,
|
||||||
domain=domain.id)
|
enabled=data['enabled'],
|
||||||
|
domain=domain.id)
|
||||||
messages.success(request,
|
messages.success(request,
|
||||||
_('User "%s" was successfully created.')
|
_('User "%s" was successfully created.')
|
||||||
% data['name'])
|
% data['name'])
|
||||||
|
Loading…
x
Reference in New Issue
Block a user