summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2016-04-13 19:58:46 +0000
committerGerrit Code Review <review@openstack.org>2016-04-13 19:58:47 +0000
commit6f950f030c78cfded678bc223a773b849c8b7d0c (patch)
treee88e6b054702ae3d2957f85a9fabb86a1c831d7d
parentfa00d7beb7226b9aba541af1fc72a0838f95c24c (diff)
parentc5cf7eccf9bf349685605c9b9e0eafe43d5dc1cb (diff)
downloadhorizon-6f950f030c78cfded678bc223a773b849c8b7d0c.tar.gz
Merge "Adds deactivated status for glance image" into stable/liberty
-rw-r--r--openstack_dashboard/dashboards/project/images/images/tables.py3
1 files changed, 3 insertions, 0 deletions
diff --git a/openstack_dashboard/dashboards/project/images/images/tables.py b/openstack_dashboard/dashboards/project/images/images/tables.py
index fa77e01e5..6ec298d43 100644
--- a/openstack_dashboard/dashboards/project/images/images/tables.py
+++ b/openstack_dashboard/dashboards/project/images/images/tables.py
@@ -282,6 +282,7 @@ class ImagesTable(tables.DataTable):
("pending_delete", None),
("killed", False),
("deleted", False),
+ ("deactivated", False),
)
STATUS_DISPLAY_CHOICES = (
("active", pgettext_lazy("Current status of an Image", u"Active")),
@@ -291,6 +292,8 @@ class ImagesTable(tables.DataTable):
u"Pending Delete")),
("killed", pgettext_lazy("Current status of an Image", u"Killed")),
("deleted", pgettext_lazy("Current status of an Image", u"Deleted")),
+ ("deactivated", pgettext_lazy("Current status of an Image",
+ u"Deactivated")),
)
TYPE_CHOICES = (
("image", pgettext_lazy("Type of an image", u"Image")),