openstack
/
horizon
Code Issues Proposed changes

Change mbformat to mb_float_format 

In the some page use mbformat to filter RAM,(Usage Summary,
instances details,database,image detail, test file), We need
change to mb_float_format.

Change-Id: Ib2d98d17949ba1b453977cb666b2e10cdf07d90b
Closes-bug:#1319230
This commit is contained in:
tintmy 2014-05-19 11:08:34 +08:00 committed by tinytmy
parent f4674f3a02
commit e31269f5e9
7 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
horizon/templates/horizon/common/_usage_summary.html
View File

@ -18,7 +18,7 @@
</form>
<p id="activity">
<span><strong>{% trans "Active Instances:" %}</strong> {{ usage.summary.instances|default:'0' }}</span>
<span><strong>{% trans "Active RAM:" %}</strong> {{ usage.summary.memory_mb|mbformat|default:'0' }}</span>
<span><strong>{% trans "Active RAM:" %}</strong> {{ usage.summary.memory_mb|mb_float_format|default:'0' }}</span>
<span><strong>{% trans "This Period's VCPU-Hours:" %}</strong> {{ usage.summary.vcpus|floatformat:2|default:'0' }}</span>
<span><strong>{% trans "This Period's GB-Hours:" %}</strong> {{ usage.summary.disk_gb_hours|floatformat:2|default:'0' }}</span>
</p>

3
openstack_dashboard/dashboards/admin/flavors/tables.py
View File

@ -23,6 +23,7 @@ from django.utils.translation import ugettext_lazy as _
from django.utils.translation import ungettext_lazy
from horizon import tables
from horizon.templatetags import sizeformat
from openstack_dashboard import api
@ -98,7 +99,7 @@ class FlavorFilterAction(tables.FilterAction):
def get_size(flavor):
return _("%sMB") % flavor.ram
return sizeformat.mb_float_format(flavor.ram)
def get_swap_size(flavor):

4
openstack_dashboard/dashboards/admin/overview/tests.py
View File

@ -115,7 +115,7 @@ class UsageViewTests(test.BaseAdminViewTests):
</tr>
''' % (usage_list[0].vcpus,
sizeformat.diskgbformat(usage_list[0].disk_gb_hours),
sizeformat.mbformat(usage_list[0].memory_mb),
sizeformat.mb_float_format(usage_list[0].memory_mb),
usage_list[0].vcpu_hours,
usage_list[0].total_local_gb_usage)
)
@ -132,7 +132,7 @@ class UsageViewTests(test.BaseAdminViewTests):
</tr>
''' % (usage_list[1].vcpus,
sizeformat.diskgbformat(usage_list[1].disk_gb_hours),
sizeformat.mbformat(usage_list[1].memory_mb),
sizeformat.mb_float_format(usage_list[1].memory_mb),
usage_list[1].vcpu_hours,
usage_list[1].total_local_gb_usage)
)

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

@ -226,7 +226,7 @@ def get_size(instance):
if hasattr(instance, "full_flavor"):
size_string = _("%(name)s | %(RAM)s RAM")
vals = {'name': instance.full_flavor.name,
'RAM': sizeformat.mbformat(instance.full_flavor.ram)}
'RAM': sizeformat.mb_float_format(instance.full_flavor.ram)}
return size_string % vals
return _("Not available")

2
openstack_dashboard/dashboards/project/databases/templates/databases/_detail_overview.html
View File

@ -26,7 +26,7 @@
<dt>{% trans "Flavor" %}</dt>
<dd>{{ instance.full_flavor.name }}</dd>
<dt>{% trans "RAM" %}</dt>
<dd>{{ instance.full_flavor.ram|mbformat }}</dd>
<dd>{{ instance.full_flavor.ram|mb_float_format }}</dd>
{% if instance.volume %}
<dt>{% trans "Volume Size" %}</dt>
<dd>{{ instance.volume.size|diskgbformat }}</dd>

2
openstack_dashboard/dashboards/project/images/templates/images/images/_detail_overview.html
View File

@ -55,7 +55,7 @@
{% endif %}
{% if image.min_ram %}
<dt>{% trans "Min RAM" %}</dt>
<dd>{{ image.min_ram|mbformat }}</dd>
<dd>{{ image.min_ram|mb_float_format }}</dd>
{% endif %}
</dl>
</div>

2
openstack_dashboard/usage/tables.py
View File

@ -35,7 +35,7 @@ class BaseUsageTable(tables.DataTable):
filters=(sizeformat.diskgbformat,))
memory = tables.Column('memory_mb',
verbose_name=_("RAM"),
filters=(sizeformat.mbformat,),
filters=(sizeformat.mb_float_format,),
attrs={"data-type": "size"})
hours = tables.Column('vcpu_hours', verbose_name=_("VCPU Hours"),
filters=(lambda v: floatformat(v, 2),))