openstack/horizon
Code Issues Proposed changes

Merge "Instances column is shortened so it fits properly"

Browse Source
This commit is contained in:
Zuul 2018-12-26 19:09:26 +00:00 committed by Gerrit Code Review
commit 2eea0f15b3
6 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -182,7 +182,7 @@ class AdminInstancesTable(tables.DataTable):
verbose_name=_("Power State"),
display_choices=project_tables.POWER_DISPLAY_CHOICES)
created = tables.Column("created",
verbose_name=_("Time since created"),
verbose_name=_("Age"),
filters=(filters.parse_isotime,
filters.timesince_sortable),
attrs={'data-type': 'timesince'})

2
openstack_dashboard/dashboards/identity/projects/tests.py
View File

@ -1270,7 +1270,7 @@ class UsageViewTests(test.BaseAdminViewTests):
self.assertIsInstance(res.context['usage'], usage.ProjectUsage)
hdr = ('Instance Name,VCPUs,RAM (MB),Disk (GB),Usage (Hours),'
'Time since created (Seconds),State')
'Age (Seconds),State')
self.assertContains(res, '%s\r\n' % hdr)
self.assert_mock_multiple_calls_with_same_arguments(

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

@ -1280,7 +1280,7 @@ class InstancesTable(tables.DataTable):
verbose_name=_("Power State"),
display_choices=POWER_DISPLAY_CHOICES)
created = tables.Column("created",
verbose_name=_("Time since created"),
verbose_name=_("Age"),
filters=(filters.parse_isotime,
filters.timesince_sortable),
attrs={'data-type': 'timesince'})

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

@ -18,7 +18,7 @@
<dd>{{ instance.availability_zone|default:_("-") }}</dd>
<dt>{% trans "Created" %}</dt>
<dd>{{ instance.created|parse_isotime }}</dd>
<dt>{% trans "Time Since Created" %}</dt>
<dt>{% trans "Age" %}</dt>
<dd>{{ instance.created|parse_isotime|timesince }}</dd>
{% if instance.host_server %}
<dt>{% trans "Host" %}</dt>

2
openstack_dashboard/dashboards/project/overview/views.py
View File

@ -36,7 +36,7 @@ class ProjectUsageCsvRenderer(csvbase.BaseCsvResponse):
columns = [_("Instance Name"), _("VCPUs"), _("RAM (MB)"),
_("Disk (GB)"), _("Usage (Hours)"),
_("Time since created (Seconds)"), _("State")]
_("Age (Seconds)"), _("State")]
def get_row_data(self):

2
openstack_dashboard/usage/tables.py
View File

@ -83,7 +83,7 @@ class ProjectUsageTable(BaseUsageTable):
verbose_name=_("Instance Name"),
link=get_instance_link)
uptime = tables.Column('uptime_at',
verbose_name=_("Time since created"),
verbose_name=_("Age"),
filters=(filters.timesince_sortable,),
attrs={'data-type': 'timesince'})