Merge "Change column order for Orchestration Services table"
This commit is contained in:
commit
184a1e6810
@ -208,14 +208,16 @@ class HeatServiceTable(tables.DataTable):
|
|||||||
engine_id = tables.Column('engine_id', verbose_name=_('Engine Id'))
|
engine_id = tables.Column('engine_id', verbose_name=_('Engine Id'))
|
||||||
host = tables.Column('host', verbose_name=_('Host'))
|
host = tables.Column('host', verbose_name=_('Host'))
|
||||||
topic = tables.Column('topic', verbose_name=_('Topic'))
|
topic = tables.Column('topic', verbose_name=_('Topic'))
|
||||||
|
# For consistent with other tables in system info, set column name to
|
||||||
|
# 'state'
|
||||||
|
state = tables.Column('status', verbose_name=_('State'),
|
||||||
|
display_choices=SERVICE_STATE_DISPLAY_CHOICES)
|
||||||
updated_at = tables.Column('updated_at',
|
updated_at = tables.Column('updated_at',
|
||||||
verbose_name=pgettext_lazy(
|
verbose_name=pgettext_lazy(
|
||||||
'Time since the last update',
|
'Time since the last update',
|
||||||
u'Last Updated'),
|
u'Last Updated'),
|
||||||
filters=(utils_filters.parse_isotime,
|
filters=(utils_filters.parse_isotime,
|
||||||
filters.timesince))
|
filters.timesince))
|
||||||
status = tables.Column('status', verbose_name=_('Status'),
|
|
||||||
display_choices=SERVICE_STATE_DISPLAY_CHOICES)
|
|
||||||
|
|
||||||
def get_object_id(self, obj):
|
def get_object_id(self, obj):
|
||||||
return "%s" % obj.engine_id
|
return "%s" % obj.engine_id
|
||||||
|
Loading…
x
Reference in New Issue
Block a user