openstack
/
horizon
Code Issues Proposed changes

Merge "Add reserved status key word to horizon" into stable/queens

This commit is contained in:
Zuul 2018-06-18 02:31:11 +00:00 committed by Gerrit Code Review
parent 7fe81e40c9 b9f0afe73d
commit ad56c780c8
2 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
openstack_dashboard/dashboards/admin/volumes/forms.py
View File

@ -36,7 +36,7 @@ from openstack_dashboard.dashboards.project.volumes.tables \
# This set of states was pulled from cinder's admin_actions.py
SETTABLE_STATUSES = (
'attaching', 'available', 'creating', 'deleting', 'detaching', 'error',
'error_deleting', 'in-use', 'maintenance')
'error_deleting', 'in-use', 'maintenance', 'reserved')
STATUS_CHOICES = tuple(
status for status in volumes_table.STATUS_DISPLAY_CHOICES
if status[0] in SETTABLE_STATUSES

2
openstack_dashboard/dashboards/project/volumes/tables.py
View File

@ -448,6 +448,8 @@ class VolumesTableBase(tables.DataTable):
u"Error Restoring")),
("maintenance", pgettext_lazy("Current status of a Volume",
u"Maintenance")),
("reserved", pgettext_lazy("Current status of a Volume",
u"Reserved")),
)
name = tables.Column("name",
verbose_name=_("Name"),