Merge "Make word wrapping consistent"

This commit is contained in:
Zuul 2021-07-29 14:52:49 +00:00 committed by Gerrit Code Review
commit 153f50ca05
5 changed files with 11 additions and 11 deletions

View File

@ -103,7 +103,7 @@ def get_agent_status(agent):
class NovaServicesTable(tables.DataTable):
binary = tables.Column("binary", verbose_name=_('Name'))
host = tables.Column('host', verbose_name=_('Host'))
host = tables.WrappingColumn('host', verbose_name=_('Host'))
zone = tables.Column('zone', verbose_name=_('Zone'))
status = tables.Column(get_agent_status, verbose_name=_('Status'))
state = tables.Column('state', verbose_name=_('State'),
@ -127,7 +127,7 @@ class NovaServicesTable(tables.DataTable):
class CinderServicesTable(tables.DataTable):
binary = tables.Column("binary", verbose_name=_('Name'))
host = tables.Column('host', verbose_name=_('Host'))
host = tables.WrappingColumn('host', verbose_name=_('Host'))
zone = tables.Column('zone', verbose_name=_('Zone'))
status = tables.Column(get_agent_status, verbose_name=_('Status'))
state = tables.Column('state', verbose_name=_('State'),
@ -202,7 +202,7 @@ class NetworkL3AgentRoutersLinkAction(tables.LinkAction):
class NetworkAgentsTable(tables.DataTable):
agent_type = tables.Column('agent_type', verbose_name=_('Type'))
binary = tables.Column("binary", verbose_name=_('Name'))
host = tables.Column('host', verbose_name=_('Host'))
host = tables.WrappingColumn('host', verbose_name=_('Host'))
zone = tables.Column(get_network_agent_zone, verbose_name=_('Zone'))
status = tables.Column(get_network_agent_status, verbose_name=_('Status'))
state = tables.Column(get_network_agent_state, verbose_name=_('State'))

View File

@ -147,14 +147,13 @@ class AdminInstancesTable(tables.DataTable):
# techniques isn't practical. It can be added back in when we have names
# returned in a practical manner by the API.
# user = tables.Column("user_id", verbose_name=_("User"))
host = tables.Column("OS-EXT-SRV-ATTR:host",
verbose_name=_("Host"),
classes=('nowrap-col',))
host = tables.WrappingColumn("OS-EXT-SRV-ATTR:host",
verbose_name=_("Host"))
name = tables.WrappingColumn("name",
link=get_server_detail_link,
verbose_name=_("Name"))
image_name = tables.Column("image_name",
verbose_name=_("Image Name"))
image_name = tables.WrappingColumn("image_name",
verbose_name=_("Image Name"))
ip = tables.Column(project_tables.get_ips,
verbose_name=_("IP Address"),
attrs={'data-type': "ip"})

View File

@ -83,7 +83,7 @@ class DHCPAgentsFilterAction(tables.FilterAction):
class DHCPAgentsTable(tables.DataTable):
id = tables.Column('id', verbose_name=_('ID'), hidden=True)
host = tables.Column('host', verbose_name=_('Host'))
host = tables.WrappingColumn('host', verbose_name=_('Host'))
status = tables.Column(get_agent_status, verbose_name=_('Status'))
state = tables.Column(get_agent_state, verbose_name=_('Admin State'))
heartbeat_timestamp = tables.Column('heartbeat_timestamp',

View File

@ -59,7 +59,7 @@ class VolumeSnapshotsTable(volumes_tables.VolumesTableBase):
volume_name = snapshots_tables.SnapshotVolumeNameColumn(
"name", verbose_name=_("Volume Name"),
link="horizon:admin:volumes:detail")
host = tables.Column("host_name", verbose_name=_("Host"))
host = tables.WrappingColumn("host_name", verbose_name=_("Host"))
tenant = tables.Column("tenant_name", verbose_name=_("Project"))
group_snapshot = snapshots_tables.GroupSnapshotNameColumn(
"name",

View File

@ -102,7 +102,8 @@ class VolumesTable(volumes_tables.VolumesTable):
link="horizon:admin:volumes:detail")
attachments = AttachmentColumn("attachments",
verbose_name=_("Attached To"))
host = tables.Column("os-vol-host-attr:host", verbose_name=_("Host"))
host = tables.WrappingColumn("os-vol-host-attr:host",
verbose_name=_("Host"))
tenant = tables.Column(lambda obj: getattr(obj, 'tenant_name', None),
verbose_name=_("Project"))
group = volumes_tables.GroupNameColumn(