openstack/murano-dashboard
Code Issues Proposed changes

Merge "Fixes Deployment History tab incorrectly formatting status."

Browse Source
This commit is contained in:
Jenkins 2017-02-14 11:43:32 +00:00 committed by Gerrit Code Review
commit dcea9d96b2
2 changed files with 12 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
muranodashboard/environments/consts.py
View File

@ -63,7 +63,17 @@ STATUS_CHOICES = (
(STATUS_ID_DELETING, None),
(STATUS_ID_NEW, True),
(STATUS_ID_DELETE_FAILURE, False),
(STATUS_ID_DEPLOY_FAILURE, False)
(STATUS_ID_DEPLOY_FAILURE, False),
)
DEPLOYMENT_STATUS_CHOICES = (
(None, True),
(DEP_STATUS_ID_RUNNING, True),
(DEP_STATUS_ID_SUCCESS, True),
(DEP_STATUS_ID_RUNNING_W_ERRORS, False),
(DEP_STATUS_ID_RUNNING_W_WARNINGS, False),
(DEP_STATUS_ID_COMPLETED_W_WARNINGS, False),
(DEP_STATUS_ID_COMPLETED_W_ERRORS, False),
)
STATUS_DISPLAY_CHOICES = (

1
muranodashboard/environments/tables.py
View File

@ -671,6 +671,7 @@ class DeploymentsTable(tables.DataTable):
'state',
verbose_name=_('Status'),
status=True,
status_choices=consts.DEPLOYMENT_STATUS_CHOICES,
display_choices=consts.DEPLOYMENT_STATUS_DISPLAY_CHOICES)
class Meta(object):