From 062b54c6c03966409249916bf59eb6397bc0bcb5 Mon Sep 17 00:00:00 2001 From: Jeremy Stretch Date: Wed, 21 Jan 2026 15:48:52 -0500 Subject: [PATCH] Fixes #21249: Avoid unneeded user query when no event rules are present --- netbox/extras/events.py | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/netbox/extras/events.py b/netbox/extras/events.py index 6f4854ff3..b2a87c950 100644 --- a/netbox/extras/events.py +++ b/netbox/extras/events.py @@ -86,7 +86,7 @@ def enqueue_event(queue, instance, request, event_type): def process_event_rules(event_rules, object_type, event_type, data, username=None, snapshots=None, request=None): - user = User.objects.get(username=username) if username else None + user = None # To be resolved from the username if needed for event_rule in event_rules: @@ -134,6 +134,10 @@ def process_event_rules(event_rules, object_type, event_type, data, username=Non # Resolve the script from action parameters script = event_rule.action_object.python_class() + # Retrieve the User if nto already resolved + if user is None: + user = User.objects.get(username=username) + # Enqueue a Job to record the script's execution from extras.jobs import ScriptJob params = {