summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2016-01-14 11:07:53 +0000
committerGerrit Code Review <review@openstack.org>2016-01-14 11:07:53 +0000
commite3848cf0aa7a0da53989736d5d058883cecab0b5 (patch)
treed5576e2e6525ae79ac8211dd118c980eaea823c0
parent03c154b0bba5b88a45f352388faf8e17a3b341c4 (diff)
parent37d4ca3b3b6acacb5f00b1ed9047d1579298c478 (diff)
Merge "Remove data-type and sort from flavor column" into stable/kilo2015.1.3
-rw-r--r--openstack_dashboard/dashboards/project/instances/tables.py4
1 files changed, 1 insertions, 3 deletions
diff --git a/openstack_dashboard/dashboards/project/instances/tables.py b/openstack_dashboard/dashboards/project/instances/tables.py
index 1a221bf..265803e 100644
--- a/openstack_dashboard/dashboards/project/instances/tables.py
+++ b/openstack_dashboard/dashboards/project/instances/tables.py
@@ -1014,9 +1014,7 @@ class InstancesTable(tables.DataTable):
1014 ip = tables.Column(get_ips, 1014 ip = tables.Column(get_ips,
1015 verbose_name=_("IP Address"), 1015 verbose_name=_("IP Address"),
1016 attrs={'data-type': "ip"}) 1016 attrs={'data-type': "ip"})
1017 size = tables.Column(get_size, 1017 size = tables.Column(get_size, sortable=False, verbose_name=_("Size"))
1018 verbose_name=_("Size"),
1019 attrs={'data-type': 'size'})
1020 keypair = tables.Column(get_keyname, verbose_name=_("Key Pair")) 1018 keypair = tables.Column(get_keyname, verbose_name=_("Key Pair"))
1021 status = tables.Column("status", 1019 status = tables.Column("status",
1022 filters=(title, filters.replace_underscores), 1020 filters=(title, filters.replace_underscores),