openstack/horizon
Code Issues Proposed changes

Merge "Add create and update times for trove components"

Browse Source
This commit is contained in:
Jenkins 2014-07-21 10:39:34 +00:00 committed by Gerrit Code Review
commit 84c531b5be
5 changed files with 13 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -131,7 +131,7 @@ class BackupsTable(tables.DataTable):
verbose_name=_("Datastore"))
datastore_version = tables.Column(get_datastore_version,
verbose_name=_("Datastore Version"))
created = tables.Column("created", verbose_name=_("Created At"),
created = tables.Column("created", verbose_name=_("Created"),
filters=[filters.parse_isotime])
instance = tables.Column(db_name, link=db_link,
verbose_name=_("Database"))

6
openstack_dashboard/dashboards/project/database_backups/templates/database_backups/details.html
View File

@ -33,8 +33,10 @@
<dd>{{ backup.locationRef }}</dd>
<dt>{% trans "Initial Volume Size" %}</dt>
<dd>{{ backup.size }} {% trans "GB" %}</dd>
<dt>{% trans "Created On" %}</dt>
<dd>{{ backup.updated_at|date:"N jS, Y P" }}</dd>
<dt>{% trans "Created" %}</dt>
<dd>{{ backup.created|parse_isotime }}</dd>
<dt>{% trans "Updated" %}</dt>
<dd>{{ backup.updated|parse_isotime }}</dd>
<dt>{% trans "Backup Duration" %}</dt>
<dd>{{ backup.duration }}</dd>
</dl>

6
openstack_dashboard/dashboards/project/database_backups/views.py
View File

@ -80,9 +80,9 @@ class DetailView(horizon_views.APIView):
backup_id = kwargs.get("backup_id")
try:
backup = api.trove.backup_get(request, backup_id)
backup.created_at = filters.parse_isotime(backup.created)
backup.updated_at = filters.parse_isotime(backup.updated)
backup.duration = backup.updated_at - backup.created_at
created_at = filters.parse_isotime(backup.created)
updated_at = filters.parse_isotime(backup.updated)
backup.duration = updated_at - created_at
except Exception:
redirect = reverse('horizon:project:database_backups:index')
msg = _('Unable to retrieve details for backup: %s') % backup_id

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

@ -246,7 +246,7 @@ class InstanceBackupsTable(tables.DataTable):
name = tables.Column("name",
link=("horizon:project:database_backups:detail"),
verbose_name=_("Name"))
created = tables.Column("created", verbose_name=_("Created At"),
created = tables.Column("created", verbose_name=_("Created"),
filters=[filters.parse_isotime])
location = tables.Column(lambda obj: _("Download"),
link=lambda obj: obj.locationRef,

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

@ -31,6 +31,10 @@
<dt>{% trans "Volume Size" %}</dt>
<dd>{{ instance.volume.size|diskgbformat }}</dd>
{% endif %}
<dt>{% trans "Created" %}</dt>
<dd>{{ instance.created|parse_isotime }}</dd>
<dt>{% trans "Updated" %}</dt>
<dd>{{ instance.updated|parse_isotime }}</dd>
</dl>
</div>