From 46a024441cc27f8e1bb81fa3ab5983f609845a63 Mon Sep 17 00:00:00 2001 From: Jeremy Stretch Date: Tue, 16 Mar 2021 11:28:50 -0400 Subject: [PATCH] Closes #5995: Dropped backward compatibility for queryset parameter on ObjectVar and MultiObjectVar --- docs/release-notes/version-2.11.md | 1 + netbox/extras/scripts.py | 14 ++------------ 2 files changed, 3 insertions(+), 12 deletions(-) diff --git a/docs/release-notes/version-2.11.md b/docs/release-notes/version-2.11.md index 777dcfce9..b99c3191e 100644 --- a/docs/release-notes/version-2.11.md +++ b/docs/release-notes/version-2.11.md @@ -85,6 +85,7 @@ The ObjectChange model (which is used to record the creation, modification, and * [#1638](https://github.com/netbox-community/netbox/issues/1638) - Migrate all primary keys to 64-bit integers * [#5873](https://github.com/netbox-community/netbox/issues/5873) - Use numeric IDs in all object URLs * [#5990](https://github.com/netbox-community/netbox/issues/5990) - Deprecated `display_field` parameter for custom script ObjectVar and MultiObjectVar fields +* [#5995](https://github.com/netbox-community/netbox/issues/5995) - Dropped backward compatibility for `queryset` parameter on ObjectVar and MultiObjectVar (use `model` instead) ### REST API Changes diff --git a/netbox/extras/scripts.py b/netbox/extras/scripts.py index 062b90ea9..29ecc3ef3 100644 --- a/netbox/extras/scripts.py +++ b/netbox/extras/scripts.py @@ -186,7 +186,7 @@ class ObjectVar(ScriptVariable): """ form_field = DynamicModelChoiceField - def __init__(self, model=None, queryset=None, query_params=None, null_option=None, *args, **kwargs): + def __init__(self, model, query_params=None, null_option=None, *args, **kwargs): # TODO: Remove display_field in v2.12 if 'display_field' in kwargs: @@ -198,18 +198,8 @@ class ObjectVar(ScriptVariable): super().__init__(*args, **kwargs) - # Set the form field's queryset. Support backward compatibility for the "queryset" argument for now. - if model is not None: - self.field_attrs['queryset'] = model.objects.all() - elif queryset is not None: - warnings.warn( - f'{self}: Specifying a queryset for ObjectVar is no longer supported. Please use "model" instead.' - ) - self.field_attrs['queryset'] = queryset - else: - raise TypeError('ObjectVar must specify a model') - self.field_attrs.update({ + 'queryset': model.objects.all(), 'display_field': display_field, 'query_params': query_params, 'null_option': null_option,