summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2017-02-14 11:43:32 +0000
committerGerrit Code Review <review@openstack.org>2017-02-14 11:43:32 +0000
commitdcea9d96b290b86d0e7d724dc1336fe6819a89d4 (patch)
treeb28733f007a2ed36e25b387e13d40ac93918b958
parenta0dbc277bd1e0e44688cd9da904a67c5a0358ab2 (diff)
parent8a10c6a62f6ba8fee6cd5224dd71e740f53fdb58 (diff)
Merge "Fixes Deployment History tab incorrectly formatting status."3.2.0
-rw-r--r--muranodashboard/environments/consts.py12
-rw-r--r--muranodashboard/environments/tables.py1
2 files changed, 12 insertions, 1 deletions
diff --git a/muranodashboard/environments/consts.py b/muranodashboard/environments/consts.py
index eedadbd..bc8d88c 100644
--- a/muranodashboard/environments/consts.py
+++ b/muranodashboard/environments/consts.py
@@ -63,7 +63,17 @@ STATUS_CHOICES = (
63 (STATUS_ID_DELETING, None), 63 (STATUS_ID_DELETING, None),
64 (STATUS_ID_NEW, True), 64 (STATUS_ID_NEW, True),
65 (STATUS_ID_DELETE_FAILURE, False), 65 (STATUS_ID_DELETE_FAILURE, False),
66 (STATUS_ID_DEPLOY_FAILURE, False) 66 (STATUS_ID_DEPLOY_FAILURE, False),
67)
68
69DEPLOYMENT_STATUS_CHOICES = (
70 (None, True),
71 (DEP_STATUS_ID_RUNNING, True),
72 (DEP_STATUS_ID_SUCCESS, True),
73 (DEP_STATUS_ID_RUNNING_W_ERRORS, False),
74 (DEP_STATUS_ID_RUNNING_W_WARNINGS, False),
75 (DEP_STATUS_ID_COMPLETED_W_WARNINGS, False),
76 (DEP_STATUS_ID_COMPLETED_W_ERRORS, False),
67) 77)
68 78
69STATUS_DISPLAY_CHOICES = ( 79STATUS_DISPLAY_CHOICES = (
diff --git a/muranodashboard/environments/tables.py b/muranodashboard/environments/tables.py
index c9d81ac..143a1c2 100644
--- a/muranodashboard/environments/tables.py
+++ b/muranodashboard/environments/tables.py
@@ -671,6 +671,7 @@ class DeploymentsTable(tables.DataTable):
671 'state', 671 'state',
672 verbose_name=_('Status'), 672 verbose_name=_('Status'),
673 status=True, 673 status=True,
674 status_choices=consts.DEPLOYMENT_STATUS_CHOICES,
674 display_choices=consts.DEPLOYMENT_STATUS_DISPLAY_CHOICES) 675 display_choices=consts.DEPLOYMENT_STATUS_DISPLAY_CHOICES)
675 676
676 class Meta(object): 677 class Meta(object):