openstack/horizon
Code Issues Proposed changes

Merge "Display volume size for trove instances"

Browse Source
This commit is contained in:
Jenkins 2014-07-13 23:59:35 +00:00 committed by Gerrit Code Review
commit 431cb23d73
2 changed files with 13 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -133,6 +133,12 @@ def get_size(instance):
return _("Not available")
def get_volume_size(instance):
if hasattr(instance, "volume"):
return sizeformat.diskgbformat(instance.volume.get("size"))
return _("Not available")
def get_databases(user):
if hasattr(user, "access"):
databases = [db.name for db in user.access]
@ -156,6 +162,9 @@ class InstancesTable(tables.DataTable):
size = tables.Column(get_size,
verbose_name=_("Size"),
attrs={'data-type': 'size'})
volume = tables.Column(get_volume_size,
verbose_name=_("Volume Size"),
attrs={'data-type': 'size'})
status = tables.Column("status",
filters=(title, filters.replace_underscores),
verbose_name=_("Status"),

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

@ -14,6 +14,10 @@
<dd>{{ instance.status|title }}</dd>
<dt>{% trans "RAM" %}</dt>
<dd>{{ instance.full_flavor.ram|mbformat }}</dd>
{% if instance.volume %}
<dt>{% trans "Volume Size" %}</dt>
<dd>{{ instance.volume.size|diskgbformat }}</dd>
{% endif %}
</dl>
</div>