Merge "Making compute services status fields consistent"

This commit is contained in:
Jenkins 2014-07-01 13:08:29 +00:00 committed by Gerrit Code Review
commit 5f4b231633
2 changed files with 3 additions and 2 deletions

View File

@ -80,7 +80,8 @@ class NovaServicesTable(tables.DataTable):
host = tables.Column('host', verbose_name=_('Host'))
zone = tables.Column('zone', verbose_name=_('Zone'))
status = tables.Column(get_nova_agent_status, verbose_name=_('Status'))
state = tables.Column('state', verbose_name=_('State'))
state = tables.Column('state', verbose_name=_('State'),
filters=(filters.title,))
updated_at = tables.Column('updated_at',
verbose_name=_('Updated At'),
filters=(utils_filters.parse_isotime,

View File

@ -1,5 +1,5 @@
{% load i18n %}
{{ status }}
{{ status|title }}
{% if status == 'disabled' and disabled_reason %}
<br/><i>{% trans "Reason" %}: {{ disabled_reason }}</i>
{% endif %}