From 9a788349a94c925a21f3f4cd62d6fd79689db023 Mon Sep 17 00:00:00 2001 From: Arthur Hanson Date: Thu, 27 Apr 2023 08:26:14 -0700 Subject: [PATCH] 12252 allow sorting on object in search (#12357) * 12252 allow sorting on object in search * 12252 code review changes --- netbox/netbox/search/backends.py | 9 ++++++--- netbox/netbox/tables/tables.py | 3 ++- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/netbox/netbox/search/backends.py b/netbox/netbox/search/backends.py index f428842f5..4487b6bb8 100644 --- a/netbox/netbox/search/backends.py +++ b/netbox/netbox/search/backends.py @@ -145,9 +145,12 @@ class CachedValueSearchBackend(SearchBackend): ) # Omit any results pertaining to an object the user does not have permission to view - return [ - r for r in results if r.object is not None - ] + ret = [] + for r in results: + if r.object is not None: + r.name = str(r.object) + ret.append(r) + return ret def cache(self, instances, indexer=None, remove_existing=True): content_type = None diff --git a/netbox/netbox/tables/tables.py b/netbox/netbox/tables/tables.py index 3047719b7..ee171f1a8 100644 --- a/netbox/netbox/tables/tables.py +++ b/netbox/netbox/tables/tables.py @@ -204,7 +204,8 @@ class SearchTable(tables.Table): order_by="object___meta__verbose_name", ) object = tables.Column( - linkify=True + linkify=True, + order_by=('name', ) ) field = tables.Column() value = tables.Column()