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

Fixes #14081: Fix cached counters on delete for parent-child items (#14131)

Browse Source 
* 14081 fixed cached counters on delete for parent-child items

* Misc cleanup

---------

Co-authored-by: Jeremy Stretch <jstretch@netboxlabs.com>
This commit is contained in:
Arthur Hanson 2023-12-12 13:53:04 -08:00 committed by GitHub
parent 6939ae4a47
commit b93735861d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 15 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
netbox/utilities/counters.py
View File

@ -1,6 +1,6 @@
from django.apps import apps from django.apps import apps
from django.db.models import F, Count, OuterRef, Subquery from django.db.models import F, Count, OuterRef, Subquery
from django.db.models.signals import post_delete, post_save from django.db.models.signals import post_delete, post_save, pre_delete
from netbox.registry import registry from netbox.registry import registry
from .fields import CounterCacheField from .fields import CounterCacheField
@ -62,6 +62,12 @@ def post_save_receiver(sender, instance, created, **kwargs):
update_counter(parent_model, new_pk, counter_name, 1) update_counter(parent_model, new_pk, counter_name, 1)
def pre_delete_receiver(sender, instance, origin, **kwargs):
model = instance._meta.model
if not model.objects.filter(pk=instance.pk).exists():
instance._previously_removed = True
def post_delete_receiver(sender, instance, origin, **kwargs): def post_delete_receiver(sender, instance, origin, **kwargs):
""" """
Update counter fields on related objects when a TrackingModelMixin subclass is deleted. Update counter fields on related objects when a TrackingModelMixin subclass is deleted.
@ -71,10 +77,8 @@ def post_delete_receiver(sender, instance, origin, **kwargs):
parent_pk = getattr(instance, field_name, None) parent_pk = getattr(instance, field_name, None)
# Decrement the parent's counter by one # Decrement the parent's counter by one
if parent_pk is not None: if parent_pk is not None and not hasattr(instance, "_previously_removed"):
# MPTT sends two delete signals for child elements so guard against multiple decrements update_counter(parent_model, parent_pk, counter_name, -1)
if not origin or origin == instance:
update_counter(parent_model, parent_pk, counter_name, -1)
# #
@ -106,6 +110,12 @@ def connect_counters(*models):
weak=False, weak=False,
dispatch_uid=f'{model._meta.label}.{field.name}' dispatch_uid=f'{model._meta.label}.{field.name}'
) )
pre_delete.connect(
pre_delete_receiver,
sender=to_model,
weak=False,
dispatch_uid=f'{model._meta.label}.{field.name}'
)
post_delete.connect( post_delete.connect(
post_delete_receiver, post_delete_receiver,
sender=to_model, sender=to_model,