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

Fixes #10721: Disable ordering by custom object field columns

jeremystretch 3 лет назад
Родитель
Сommit
cf55e96241
2 измененных файлов с 7 добавлено и 0 удалено
  1. 1 0
      docs/release-notes/version-3.3.md
  2. 6 0
      netbox/netbox/tables/columns.py

+ 1 - 0
docs/release-notes/version-3.3.md

@@ -6,6 +6,7 @@
 
 
 * [#9878](https://github.com/netbox-community/netbox/issues/9878) - Fix spurious error message when rendering REST API docs
 * [#9878](https://github.com/netbox-community/netbox/issues/9878) - Fix spurious error message when rendering REST API docs
 * [#10579](https://github.com/netbox-community/netbox/issues/10579) - Mark cable traces terminating to a provider network as complete
 * [#10579](https://github.com/netbox-community/netbox/issues/10579) - Mark cable traces terminating to a provider network as complete
+* [#10721](https://github.com/netbox-community/netbox/issues/10721) - Disable ordering by custom object field columns
 
 
 ---
 ---
 
 

+ 6 - 0
netbox/netbox/tables/columns.py

@@ -425,6 +425,12 @@ class CustomFieldColumn(tables.Column):
         kwargs['accessor'] = Accessor(f'custom_field_data__{customfield.name}')
         kwargs['accessor'] = Accessor(f'custom_field_data__{customfield.name}')
         if 'verbose_name' not in kwargs:
         if 'verbose_name' not in kwargs:
             kwargs['verbose_name'] = customfield.label or customfield.name
             kwargs['verbose_name'] = customfield.label or customfield.name
+        # We can't logically sort on FK values
+        if customfield.type in (
+            CustomFieldTypeChoices.TYPE_OBJECT,
+            CustomFieldTypeChoices.TYPE_MULTIOBJECT
+        ):
+            kwargs['orderable'] = False
 
 
         super().__init__(*args, **kwargs)
         super().__init__(*args, **kwargs)