Merge "Add datastore and version information for backups"

This commit is contained in:
Jenkins 2014-07-14 23:26:35 +00:00 committed by Gerrit Code Review
commit 301d48757a
2 changed files with 22 additions and 0 deletions

View File

@ -111,10 +111,26 @@ def db_name(obj):
return obj.instance.name
def get_datastore(obj):
if hasattr(obj, "datastore"):
return obj.datastore["type"]
return _("Not available")
def get_datastore_version(obj):
if hasattr(obj, "datastore"):
return obj.datastore["version"]
return _("Not available")
class BackupsTable(tables.DataTable):
name = tables.Column("name",
link="horizon:project:database_backups:detail",
verbose_name=_("Name"))
datastore = tables.Column(get_datastore,
verbose_name=_("Datastore"))
datastore_version = tables.Column(get_datastore_version,
verbose_name=_("Datastore Version"))
created = tables.Column("created", verbose_name=_("Created At"),
filters=[filters.parse_isotime])
instance = tables.Column(db_name, link=db_link,

View File

@ -21,6 +21,12 @@
<dd>{{ backup.description|linebreaksbr }}</dd>
<dt>{% trans "ID" %}</dt>
<dd>{{ backup.id }}</dd>
{% if backup.datastore %}
<dt>{% trans "Datastore" %}</dt>
<dd>{{ backup.datastore.type }}</dd>
<dt>{% trans "Datastore Version" %}</dt>
<dd>{{ backup.datastore.version }}</dd>
{% endif %}
<dt>{% trans "Status" %}</dt>
<dd>{{ backup.status|title }}</dd>
<dt>{% trans "Backup File Location" %}</dt>