mirror/netbox-community-netbox
1
0
Fork 0
mirror of https://github.com/netbox-community/netbox.git synced 2024-05-10 07:54:54 +00:00
Code Activity

Fixes #5309: Avoid extraneous database queries when manipulating objects

Browse Source
This commit is contained in:
Jeremy Stretch
2020-11-20 15:40:09 -05:00
parent 3dd2e4c84c
commit 181f5c991b
2 changed files with 8 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -9,6 +9,7 @@
### Bug Fixes ### Bug Fixes
* [#5235](https://github.com/netbox-community/netbox/issues/5235) - Fix exception when editing IP address with a NAT IP assigned to a non-racked device * [#5235](https://github.com/netbox-community/netbox/issues/5235) - Fix exception when editing IP address with a NAT IP assigned to a non-racked device
* [#5309](https://github.com/netbox-community/netbox/issues/5309) - Avoid extraneous database queries when manipulating objects
* [#5345](https://github.com/netbox-community/netbox/issues/5345) - Fix non-deterministic ordering of prefixes and IP addresses * [#5345](https://github.com/netbox-community/netbox/issues/5345) - Fix non-deterministic ordering of prefixes and IP addresses
* [#5350](https://github.com/netbox-community/netbox/issues/5350) - Filter available racks by selected group when creating a rack reservation * [#5350](https://github.com/netbox-community/netbox/issues/5350) - Filter available racks by selected group when creating a rack reservation
* [#5355](https://github.com/netbox-community/netbox/issues/5355) - Limit rack groups by selected site when editing a rack * [#5355](https://github.com/netbox-community/netbox/issues/5355) - Limit rack groups by selected site when editing a rack

13
netbox/extras/webhooks.py
View File

@ -5,10 +5,10 @@ from django.contrib.contenttypes.models import ContentType
from django.utils import timezone from django.utils import timezone
from django_rq import get_queue from django_rq import get_queue
from extras.models import Webhook
from utilities.api import get_serializer_for_model from utilities.api import get_serializer_for_model
from .choices import * from .choices import *
from .utils import FeatureQuery from .models import Webhook
from .registry import registry
def generate_signature(request_body, secret): def generate_signature(request_body, secret):
@ -28,13 +28,14 @@ def enqueue_webhooks(instance, user, request_id, action):
Find Webhook(s) assigned to this instance + action and enqueue them Find Webhook(s) assigned to this instance + action and enqueue them
to be processed to be processed
""" """
obj_type = ContentType.objects.get_for_model(instance.__class__) # Determine whether this type of object supports webhooks
app_label = instance._meta.app_label
webhook_models = ContentType.objects.filter(FeatureQuery('webhooks').get_query()) model_name = instance._meta.model_name
if obj_type not in webhook_models: if model_name not in registry['model_features']['webhooks'].get(app_label, []):
return return
# Retrieve any applicable Webhooks # Retrieve any applicable Webhooks
obj_type = ContentType.objects.get_for_model(instance)
action_flag = { action_flag = {
ObjectChangeActionChoices.ACTION_CREATE: 'type_create', ObjectChangeActionChoices.ACTION_CREATE: 'type_create',
ObjectChangeActionChoices.ACTION_UPDATE: 'type_update', ObjectChangeActionChoices.ACTION_UPDATE: 'type_update',