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

Fixes #6584: Fix ordering of nested inventory items

jeremystretch 4 лет назад
Родитель
Сommit
809d9e4697
2 измененных файлов с 3 добавлено и 2 удалено
  1. 1 0
      docs/release-notes/version-2.11.md
  2. 2 2
      netbox/dcim/tables/devices.py

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

@@ -12,6 +12,7 @@
 * [#6553](https://github.com/netbox-community/netbox/issues/6553) - ProviderNetwork search should match on name
 * [#6562](https://github.com/netbox-community/netbox/issues/6562) - Disable ordering of secrets by assigned object
 * [#6563](https://github.com/netbox-community/netbox/issues/6563) - Fix filtering by location for cable connection forms
+* [#6584](https://github.com/netbox-community/netbox/issues/6584) - Fix ordering of nested inventory items
 
 ---
 

+ 2 - 2
netbox/dcim/tables/devices.py

@@ -694,7 +694,7 @@ class InventoryItemTable(DeviceComponentTable):
     )
     cable = None  # Override DeviceComponentTable
 
-    class Meta(DeviceComponentTable.Meta):
+    class Meta(BaseTable.Meta):
         model = InventoryItem
         fields = (
             'pk', 'device', 'name', 'label', 'manufacturer', 'part_id', 'serial', 'asset_tag', 'description',
@@ -715,7 +715,7 @@ class DeviceInventoryItemTable(InventoryItemTable):
         buttons=('edit', 'delete')
     )
 
-    class Meta(DeviceComponentTable.Meta):
+    class Meta(BaseTable.Meta):
         model = InventoryItem
         fields = (
             'pk', 'name', 'label', 'manufacturer', 'part_id', 'serial', 'asset_tag', 'description', 'discovered',