From 0995e10d8720efe1af7c08cfd189ff6fafc47416 Mon Sep 17 00:00:00 2001 From: dansheps Date: Thu, 19 Mar 2020 08:09:31 -0500 Subject: [PATCH] Modify script ObjectVars to use DynamicModelChoiceFields --- netbox/extras/scripts.py | 8 ++++---- netbox/extras/tests/test_scripts.py | 6 ++---- 2 files changed, 6 insertions(+), 8 deletions(-) diff --git a/netbox/extras/scripts.py b/netbox/extras/scripts.py index fdde58a83..55d53700f 100644 --- a/netbox/extras/scripts.py +++ b/netbox/extras/scripts.py @@ -170,8 +170,8 @@ class ObjectVar(ScriptVariable): """ form_field = DynamicModelChoiceField - def __init__(self, queryset, widget, *args, **kwargs): - super().__init__(widget=widget, *args, **kwargs) + def __init__(self, queryset, *args, **kwargs): + super().__init__(*args, **kwargs) # Queryset for field choices self.field_attrs['queryset'] = queryset @@ -187,8 +187,8 @@ class MultiObjectVar(ScriptVariable): """ form_field = DynamicModelMultipleChoiceField - def __init__(self, queryset, widget, *args, **kwargs): - super().__init__(widget=widget, *args, **kwargs) + def __init__(self, queryset, *args, **kwargs): + super().__init__(*args, **kwargs) # Queryset for field choices self.field_attrs['queryset'] = queryset diff --git a/netbox/extras/tests/test_scripts.py b/netbox/extras/tests/test_scripts.py index 2d4d5b3fd..ea2888bd8 100644 --- a/netbox/extras/tests/test_scripts.py +++ b/netbox/extras/tests/test_scripts.py @@ -130,8 +130,7 @@ class ScriptVariablesTest(TestCase): class TestScript(Script): var1 = ObjectVar( - queryset=DeviceRole.objects.all(), - widget=APISelect(api_url='/api/dcim/device-roles/') + queryset=DeviceRole.objects.all() ) # Populate some objects @@ -152,8 +151,7 @@ class ScriptVariablesTest(TestCase): class TestScript(Script): var1 = MultiObjectVar( - queryset=DeviceRole.objects.all(), - widget=APISelectMultiple(api_url='/api/dcim/device-roles/') + queryset=DeviceRole.objects.all() ) # Populate some objects