Merge "Don't get descript if attribute doesn't exist."
This commit is contained in:
commit
5f0bf07b95
@ -193,14 +193,20 @@ class UpdateCell(tables.UpdateAction):
|
|||||||
try:
|
try:
|
||||||
user_obj = datum
|
user_obj = datum
|
||||||
setattr(user_obj, cell_name, new_cell_value)
|
setattr(user_obj, cell_name, new_cell_value)
|
||||||
api.keystone.user_update(
|
kwargs = {}
|
||||||
request,
|
attr_to_keyword_map = {
|
||||||
user_obj,
|
'name': 'name',
|
||||||
name=user_obj.name,
|
'description': 'description',
|
||||||
description=user_obj.description,
|
'email': 'email',
|
||||||
email=user_obj.email,
|
'enabled': 'enabled',
|
||||||
enabled=user_obj.enabled,
|
'project_id': 'project'
|
||||||
project=user_obj.project_id)
|
}
|
||||||
|
for key in attr_to_keyword_map:
|
||||||
|
value = getattr(user_obj, key, None)
|
||||||
|
keyword_name = attr_to_keyword_map[key]
|
||||||
|
if value is not None:
|
||||||
|
kwargs[keyword_name] = value
|
||||||
|
api.keystone.user_update(request, user_obj, **kwargs)
|
||||||
|
|
||||||
except horizon_exceptions.Conflict:
|
except horizon_exceptions.Conflict:
|
||||||
message = _("This name is already taken.")
|
message = _("This name is already taken.")
|
||||||
|
Loading…
x
Reference in New Issue
Block a user