NeoAnd/netbox
1
0
Fork 0
mirror of https://github.com/netbox-community/netbox.git synced 2025-07-24 17:38:37 -06:00
Code Issues Actions 11 Packages Projects Releases Wiki Activity

Fixes #18845: restores sort behavior for DeviceTable.name column (#18861)

Browse Source 
* Fixes #18845: restores sort behavior for DeviceTable.name column

* Remove accessor/order_by and modify DEVICE_LINK template

Thanks to @alehaa for the suggestion.

This also includes an additional `.select_related()` operation on
`DeviceListView.queryset` to avoid extra queries. Thanks to
@renatoalmeidaoliveira and @jeremystretch for pointing out the need for
this.
This commit is contained in:
Jason Novinger 2025-03-13 09:22:49 -04:00 committed by GitHub
parent 80926cda8f
commit 78332d44c7
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
netbox/dcim/tables/devices.py
View File

@ -143,9 +143,8 @@ class PlatformTable(NetBoxTable):
class DeviceTable(TenancyColumnsMixin, ContactsColumnMixin, NetBoxTable): class DeviceTable(TenancyColumnsMixin, ContactsColumnMixin, NetBoxTable):
name = tables.TemplateColumn( name = tables.TemplateColumn(
verbose_name=_('Name'), verbose_name=_('Name'),
accessor=Accessor('label'),
template_code=DEVICE_LINK, template_code=DEVICE_LINK,
linkify=True linkify=True,
) )
status = columns.ChoiceFieldColumn( status = columns.ChoiceFieldColumn(
verbose_name=_('Status'), verbose_name=_('Status'),

2
netbox/dcim/tables/template_code.py
View File

@ -35,7 +35,7 @@ WEIGHT = """
""" """
DEVICE_LINK = """ DEVICE_LINK = """
{{ value|default:'<span class="badge text-bg-info">Unnamed device</span>' }} {{ record.label|default:'<span class="badge text-bg-info">Unnamed device</span>' }}
""" """
DEVICEBAY_STATUS = """ DEVICEBAY_STATUS = """

2
netbox/dcim/views.py
View File

@ -2034,7 +2034,7 @@ class PlatformBulkDeleteView(generic.BulkDeleteView):
@register_model_view(Device, 'list', path='', detail=False) @register_model_view(Device, 'list', path='', detail=False)
class DeviceListView(generic.ObjectListView): class DeviceListView(generic.ObjectListView):
queryset = Device.objects.all() queryset = Device.objects.select_related('virtual_chassis')
filterset = filtersets.DeviceFilterSet filterset = filtersets.DeviceFilterSet
filterset_form = forms.DeviceFilterForm filterset_form = forms.DeviceFilterForm
table = tables.DeviceTable table = tables.DeviceTable