openstack
/
adjutant-ui
Code Issues Proposed changes

Properly handle empty values for show task. 

* added getattr for getting values in the _show_task function

Change-Id: I4619c7d9989894fe32fdfe310d18a26b2f80c80c
This commit is contained in:
adrian-turjak 2017-05-29 11:55:35 +12:00
parent bf62bc73a0
commit a9b57aafb7
1 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
adjutantclient/osc/v1/tasks.py
View File

@ -26,13 +26,14 @@ LOG = logging.getLogger(__name__)
def _show_task(task_id, client, formatter):
task = client.tasks.get(task_id)
if formatter == 'table':
task._info['actions'] = json.dumps(task.actions, indent=2)
task._info['keystone_user'] = json.dumps(task.keystone_user,
indent=2)
task._info['action_notes'] = json.dumps(task.action_notes,
indent=2)
task._info['approved_by'] = json.dumps(task.approved_by,
indent=2)
task._info['actions'] = json.dumps(
getattr(task, 'actions', ""), indent=2)
task._info['keystone_user'] = json.dumps(
getattr(task, 'keystone_user', ""), indent=2)
task._info['action_notes'] = json.dumps(
getattr(task, 'action_notes', ""), indent=2)
task._info['approved_by'] = json.dumps(
getattr(task, 'approved_by', ""), indent=2)
return zip(*six.iteritems(task.to_dict()))