Просмотр исходного кода

12252 allow sorting on object in search (#12357)

* 12252 allow sorting on object in search

* 12252 code review changes
Arthur Hanson 2 лет назад
Родитель
Сommit
9a788349a9
2 измененных файлов с 8 добавлено и 4 удалено
  1. 6 3
      netbox/netbox/search/backends.py
  2. 2 1
      netbox/netbox/tables/tables.py

+ 6 - 3
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

+ 2 - 1
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()