openstack
/
horizon
Code Issues Proposed changes

Merge "not display loading image for rescued instances"

This commit is contained in:
Jenkins 2014-05-21 03:43:27 +00:00 committed by Gerrit Code Review
parent 1efacd9872 40c220471e
commit 8314fb1367
2 changed files with 4 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
openstack_dashboard/dashboards/admin/instances/tables.py
View File

@ -116,6 +116,8 @@ class AdminInstancesTable(tables.DataTable):
("suspended", True),
("paused", True),
("error", False),
("rescue", True),
("shelved offloaded", True),
)
tenant = tables.Column("tenant_name", verbose_name=_("Project"))
# NOTE(gabriel): Commenting out the user column because all we have

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

@ -783,6 +783,8 @@ class InstancesTable(tables.DataTable):
("suspended", True),
("paused", True),
("error", False),
("rescue", True),
("shelved offloaded", True),
)
name = tables.Column("name",
link=("horizon:project:instances:detail"),