diff options
| author | Jenkins <jenkins@review.openstack.org> | 2014-10-02 09:47:21 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2014-10-02 09:47:21 +0000 |
| commit | fc3709e2ff163aeb2ad6f2ccaf11b6b0949bf88b (patch) | |
| tree | 44bf55b98643fe3ac5b69f447047e7de38f5d2f1 | |
| parent | f7d8b54ee0e8d5770edd6e352499aed01e526c5a (diff) | |
| parent | b5b09140b1906d6fc401493908003f6312d720a9 (diff) | |
| download | horizon-fc3709e2ff163aeb2ad6f2ccaf11b6b0949bf88b.tar.gz | |
Merge "Change column uptime"
| -rw-r--r-- | openstack_dashboard/dashboards/admin/instances/tables.py | 2 | ||||
| -rw-r--r-- | openstack_dashboard/dashboards/project/instances/tables.py | 2 | ||||
| -rw-r--r-- | openstack_dashboard/usage/tables.py | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/openstack_dashboard/dashboards/admin/instances/tables.py b/openstack_dashboard/dashboards/admin/instances/tables.py index 5c2afa596..6e7504748 100644 --- a/openstack_dashboard/dashboards/admin/instances/tables.py +++ b/openstack_dashboard/dashboards/admin/instances/tables.py @@ -149,7 +149,7 @@ class AdminInstancesTable(tables.DataTable): filters=(title, filters.replace_underscores), verbose_name=_("Power State")) created = tables.Column("created", - verbose_name=_("Uptime"), + verbose_name=_("Time since created"), filters=(filters.parse_isotime, filters.timesince_sortable), attrs={'data-type': 'timesince'}) diff --git a/openstack_dashboard/dashboards/project/instances/tables.py b/openstack_dashboard/dashboards/project/instances/tables.py index 4395900c8..2737529e3 100644 --- a/openstack_dashboard/dashboards/project/instances/tables.py +++ b/openstack_dashboard/dashboards/project/instances/tables.py @@ -911,7 +911,7 @@ class InstancesTable(tables.DataTable): verbose_name=_("Power State"), display_choices=POWER_DISPLAY_CHOICES) created = tables.Column("created", - verbose_name=_("Uptime"), + verbose_name=_("Time since created"), filters=(filters.parse_isotime, filters.timesince_sortable), attrs={'data-type': 'timesince'}) diff --git a/openstack_dashboard/usage/tables.py b/openstack_dashboard/usage/tables.py index 4727fbb0c..80b7478e9 100644 --- a/openstack_dashboard/usage/tables.py +++ b/openstack_dashboard/usage/tables.py @@ -72,7 +72,7 @@ class ProjectUsageTable(BaseUsageTable): verbose_name=_("Instance Name"), link=get_instance_link) uptime = tables.Column('uptime_at', - verbose_name=_("Uptime"), + verbose_name=_("Time since created"), filters=(filters.timesince_sortable,), attrs={'data-type': 'timesince'}) |