Skip to content

DRAFT: 14884 Make script running from UI and EventRules consistent in passing params #20596

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 2 commits into from
Closed

DRAFT: 14884 Make script running from UI and EventRules consistent in passing params #20596

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
6930df8
14884 de-reference script params from EventRule
arthanson Oct 15, 2025
18efe72
14884 log error on form validation fail
arthanson Oct 15, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 19 additions & 1 deletion netbox/extras/events.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -95,7 +95,11 @@ def process_event_rules(event_rules, object_type, event_type, data, username=Non
continue

# Compile event data
event_data = event_rule.action_data or {}
if event_rule.action_type == EventRuleActionChoices.SCRIPT:
event_data = {}
else:
event_data = event_rule.action_data or {}

event_data.update(data)

# Webhooks
Expand Down Expand Up @@ -131,6 +135,20 @@ def process_event_rules(event_rules, object_type, event_type, data, username=Non
elif event_rule.action_type == EventRuleActionChoices.SCRIPT:
# Resolve the script from action parameters
script = event_rule.action_object.python_class()
if event_rule.action_data:
form = script.as_form(event_rule.action_data)
if form.is_valid():
form.cleaned_data.pop('_schedule_at')
form.cleaned_data.pop('_interval')
form.cleaned_data.pop('_commit')
event_data.update(form.cleaned_data)
else:
logger.error(
_("Processing event rule {event_rule} failed - Cannot validate script form: {errors}").format(
event_rule=event_rule, errors=form.errors
)
)
continue

# Enqueue a Job to record the script's execution
from extras.jobs import ScriptJob
Expand Down