From 25e965edb2c3556760721345fcddd8be992486f5 Mon Sep 17 00:00:00 2001 From: Ryan Merolle Date: Fri, 3 Mar 2023 17:33:10 -0500 Subject: [PATCH] default to use fieldsets in scripts --- netbox/extras/scripts.py | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/netbox/extras/scripts.py b/netbox/extras/scripts.py index c65ed6410..2cc716060 100644 --- a/netbox/extras/scripts.py +++ b/netbox/extras/scripts.py @@ -353,11 +353,16 @@ class BaseScript: form.fields['_commit'].initial = getattr(self.Meta, 'commit_default', True) # Append the default fieldset if defined in the Meta class - default_fieldset = (('Script Execution Functions', ('_schedule_at', '_interval', '_commit')),) - if hasattr(self.Meta, 'fieldsets'): - self.Meta.fieldsets += default_fieldset - else: - pass + default_fieldset = ( + ('Script Execution Parameters', ('_schedule_at', '_interval', '_commit')), + ) + if not hasattr(self.Meta, 'fieldsets'): + fields = ( + name for name, _ in self._get_vars().items() + ) + self.Meta.fieldsets = (('Script Data', fields),) + + self.Meta.fieldsets += default_fieldset return form