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

Fixes #6173: Fix assigned device/VM count when bulk editing/deleting device roles

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

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

@@ -29,6 +29,7 @@
 * [#6130](https://github.com/netbox-community/netbox/issues/6130) - Improve display of assigned models in custom fields list
 * [#6155](https://github.com/netbox-community/netbox/issues/6155) - Fix admin links for plugins, background tasks
 * [#6171](https://github.com/netbox-community/netbox/issues/6171) - Fix display of horizontally-scrolling object lists
+* [#6173](https://github.com/netbox-community/netbox/issues/6173) - Fix assigned device/VM count when bulk editing/deleting device roles
 
 ---
 

+ 8 - 2
netbox/dcim/views.py

@@ -1172,14 +1172,20 @@ class DeviceRoleBulkImportView(generic.BulkImportView):
 
 
 class DeviceRoleBulkEditView(generic.BulkEditView):
-    queryset = DeviceRole.objects.all()
+    queryset = DeviceRole.objects.annotate(
+        device_count=count_related(Device, 'device_role'),
+        vm_count=count_related(VirtualMachine, 'role')
+    )
     filterset = filters.DeviceRoleFilterSet
     table = tables.DeviceRoleTable
     form = forms.DeviceRoleBulkEditForm
 
 
 class DeviceRoleBulkDeleteView(generic.BulkDeleteView):
-    queryset = DeviceRole.objects.all()
+    queryset = DeviceRole.objects.annotate(
+        device_count=count_related(Device, 'device_role'),
+        vm_count=count_related(VirtualMachine, 'role')
+    )
     table = tables.DeviceRoleTable