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

Fixes #6313: Fix device type instance count under manufacturer view

Browse Source
This commit is contained in:
jeremystretch 2021-04-30 10:08:15 -04:00
parent b93570eeb0
commit 2a5b497d8a
2 changed files with 3 additions and 0 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

@ -10,6 +10,7 @@
* [#6308](https://github.com/netbox-community/netbox/issues/6308) - Fix linking of available VLANs in VLAN group view * [#6308](https://github.com/netbox-community/netbox/issues/6308) - Fix linking of available VLANs in VLAN group view
* [#6309](https://github.com/netbox-community/netbox/issues/6309) - Restrict parent VM interface assignment to the parent VM * [#6309](https://github.com/netbox-community/netbox/issues/6309) - Restrict parent VM interface assignment to the parent VM
* [#6313](https://github.com/netbox-community/netbox/issues/6313) - Fix device type instance count under manufacturer view
--- ---

2
netbox/dcim/views.py
View File

@ -692,6 +692,8 @@ class ManufacturerView(generic.ObjectView):
def get_extra_context(self, request, instance): def get_extra_context(self, request, instance):
devicetypes = DeviceType.objects.restrict(request.user, 'view').filter( devicetypes = DeviceType.objects.restrict(request.user, 'view').filter(
manufacturer=instance manufacturer=instance
).annotate(
instance_count=count_related(Device, 'device_type')
) )
devicetypes_table = tables.DeviceTypeTable(devicetypes) devicetypes_table = tables.DeviceTypeTable(devicetypes)