NeoAnd/netbox
1
0
Fork 0
mirror of https://github.com/netbox-community/netbox.git synced 2025-07-25 18:08:38 -06:00
Code Issues Actions 10 Packages Projects Releases Wiki Activity

Fixes #6584: Fix ordering of nested inventory items

Browse Source
This commit is contained in:
jeremystretch 2021-06-10 14:27:42 -04:00
parent 79c06442db
commit 809d9e4697
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
docs/release-notes/version-2.11.md
View File

@ -12,6 +12,7 @@
* [#6553](https://github.com/netbox-community/netbox/issues/6553) - ProviderNetwork search should match on name * [#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 * [#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 * [#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
--- ---

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

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