NeoAnd/netbox
1
0
Fork 0
mirror of https://github.com/netbox-community/netbox.git synced 2025-07-22 20:12:00 -06:00
Code Issues Actions 8 Packages Projects Releases Wiki Activity

Fixes #9057 - Fix missing instance counts for module types

Browse Source
This commit is contained in:
Daniel Sheppard 2022-04-06 13:46:31 -05:00
parent 523390cd8e
commit 85e65edb7d
2 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -4,6 +4,7 @@
### Bug Fixes (From Beta2) ### Bug Fixes (From Beta2)
* [#9057](https://github.com/netbox-community/netbox/issues/9057) - Fix missing instance counts for module types
* [#9061](https://github.com/netbox-community/netbox/issues/9061) - Change inheritance order for DeviceComponentFilterSets * [#9061](https://github.com/netbox-community/netbox/issues/9061) - Change inheritance order for DeviceComponentFilterSets

6
netbox/dcim/views.py
View File

@ -960,7 +960,7 @@ class DeviceTypeBulkDeleteView(generic.BulkDeleteView):
class ModuleTypeListView(generic.ObjectListView): class ModuleTypeListView(generic.ObjectListView):
queryset = ModuleType.objects.prefetch_related('manufacturer').annotate( queryset = ModuleType.objects.prefetch_related('manufacturer').annotate(
# instance_count=count_related(Module, 'module_type') instance_count=count_related(Module, 'module_type')
) )
filterset = filtersets.ModuleTypeFilterSet filterset = filtersets.ModuleTypeFilterSet
filterset_form = forms.ModuleTypeFilterForm filterset_form = forms.ModuleTypeFilterForm
@ -1066,7 +1066,7 @@ class ModuleTypeImportView(generic.ObjectImportView):
class ModuleTypeBulkEditView(generic.BulkEditView): class ModuleTypeBulkEditView(generic.BulkEditView):
queryset = ModuleType.objects.prefetch_related('manufacturer').annotate( queryset = ModuleType.objects.prefetch_related('manufacturer').annotate(
# instance_count=count_related(Module, 'module_type') instance_count=count_related(Module, 'module_type')
) )
filterset = filtersets.ModuleTypeFilterSet filterset = filtersets.ModuleTypeFilterSet
table = tables.ModuleTypeTable table = tables.ModuleTypeTable
@ -1075,7 +1075,7 @@ class ModuleTypeBulkEditView(generic.BulkEditView):
class ModuleTypeBulkDeleteView(generic.BulkDeleteView): class ModuleTypeBulkDeleteView(generic.BulkDeleteView):
queryset = ModuleType.objects.prefetch_related('manufacturer').annotate( queryset = ModuleType.objects.prefetch_related('manufacturer').annotate(
# instance_count=count_related(Module, 'module_type') instance_count=count_related(Module, 'module_type')
) )
filterset = filtersets.ModuleTypeFilterSet filterset = filtersets.ModuleTypeFilterSet
table = tables.ModuleTypeTable table = tables.ModuleTypeTable