From 13313420f210ee6fafb090174dc482febc0a2984 Mon Sep 17 00:00:00 2001 From: Jeremy Stretch Date: Fri, 13 Oct 2023 13:36:20 -0400 Subject: [PATCH] Restore original termination count logic --- netbox/dcim/views.py | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/netbox/dcim/views.py b/netbox/dcim/views.py index 63488f222..7c75dd26e 100644 --- a/netbox/dcim/views.py +++ b/netbox/dcim/views.py @@ -122,15 +122,17 @@ class BulkDisconnectView(GetReturnURLMixin, ObjectPermissionRequiredMixin, View) if form.is_valid(): with transaction.atomic(): - cable_ids = { - obj.cable.pk for obj in self.queryset.filter(pk__in=form.cleaned_data['pk']) - if obj.cable is not None - } + count = 0 + cable_ids = set() + for obj in self.queryset.filter(pk__in=form.cleaned_data['pk']): + if obj.cable: + cable_ids.add(obj.cable.pk) + count += 1 for cable in Cable.objects.filter(pk__in=cable_ids): cable.delete() messages.success(request, _("Disconnected {count} {type}").format( - count=len(cable_ids), + count=count, type=self.queryset.model._meta.verbose_name_plural ))