Instances column is shortened so it fits properly
The 'Time since created' column name has been shortened to 'Age' in project instances and admin instances meaning it fits properly in table header cell and doesn't cause table header height to increase. Closes-Bug: #1614287 Change-Id: I94fc9eb260050e187445abd8236ac414b885b467 Co-Authored-By: Sam Wright <swright.wellington@gmail.com>
This commit is contained in:
parent
254e3791d3
commit
d6217b3e63
@ -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'})
|
||||
|
@ -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(
|
||||
|
@ -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'})
|
||||
|
@ -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>
|
||||
|
@ -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):
|
||||
|
||||
|
@ -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'})
|
||||
|
||||
|
Loading…
x
Reference in New Issue
Block a user