openstack/horizon
Code Issues Proposed changes

Rename Size column on instances tables to Flavor

Browse Source 
Change-Id: I33e2d6ff079f8381193a2c4d13c04ead3bec1c27
Closes-bug: #1644015
This commit is contained in:
Ying Zuo
2016-11-23 11:11:41 -08:00
parent a7cad82f38
commit f1ef8085b5
2 changed files with 7 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -140,9 +140,9 @@ class AdminInstancesTable(tables.DataTable):
ip = tables.Column(project_tables.get_ips,
verbose_name=_("IP Address"),
attrs={'data-type': "ip"})
size = tables.Column(project_tables.get_size,
sortable=False,
verbose_name=_("Size"))
flavor = tables.Column(project_tables.get_flavor,
sortable=False,
verbose_name=_("Flavor"))
status = tables.Column(
"status",
filters=(title, filters.replace_underscores),

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

@@ -1016,7 +1016,7 @@ def get_ips(instance):
return template.loader.render_to_string(template_name, context)
def get_size(instance):
def get_flavor(instance):
if hasattr(instance, "full_flavor"):
template_name = 'project/instances/_instance_flavor.html'
size_ram = sizeformat.mb_float_format(instance.full_flavor.ram)
@@ -1221,7 +1221,9 @@ class InstancesTable(tables.DataTable):
ip = tables.Column(get_ips,
verbose_name=_("IP Address"),
attrs={'data-type': "ip"})
size = tables.Column(get_size, sortable=False, verbose_name=_("Size"))
flavor = tables.Column(get_flavor,
sortable=False,
verbose_name=_("Flavor"))
keypair = tables.Column(get_keyname, verbose_name=_("Key Pair"))
status = tables.Column("status",
filters=(title, filters.replace_underscores),