From adea4437c9d7bf1cbd845bda26534be945d15457 Mon Sep 17 00:00:00 2001 From: Hedde van der Heide Date: Thu, 23 Dec 2021 11:09:58 +0100 Subject: [PATCH] fixed breaking changes (partially, templates require another fix) --- src/netbox_slm/api/serializers.py | 2 +- src/netbox_slm/forms.py | 18 +++++++++--------- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/src/netbox_slm/api/serializers.py b/src/netbox_slm/api/serializers.py index 05a4ec3..47f4e98 100644 --- a/src/netbox_slm/api/serializers.py +++ b/src/netbox_slm/api/serializers.py @@ -1,6 +1,6 @@ from rest_framework import serializers -from netbox.api.serializers import PrimaryModelSerializer, OrganizationalModelSerializer +from netbox.api.serializers import PrimaryModelSerializer # from netbox_slm.api.nested_serializers import ( # NestedRecordSerializer, # NestedNameServerSerializer, diff --git a/src/netbox_slm/forms.py b/src/netbox_slm/forms.py index 388d553..5f64ade 100644 --- a/src/netbox_slm/forms.py +++ b/src/netbox_slm/forms.py @@ -16,7 +16,7 @@ from utilities.forms import ( from virtualization.models import VirtualMachine -class SoftwareProductForm(BootstrapMixin, CustomFieldModelForm): +class SoftwareProductForm(CustomFieldModelForm): """Form for creating a new SoftwareProduct object.""" manufacturer = DynamicModelChoiceField( @@ -37,7 +37,7 @@ class SoftwareProductForm(BootstrapMixin, CustomFieldModelForm): fields = ("name", "manufacturer", "description",) # "tags") -class SoftwareProductFilterForm(BootstrapMixin, CustomFieldModelFilterForm): +class SoftwareProductFilterForm(CustomFieldModelFilterForm): """Form for filtering SoftwareProduct instances.""" model = SoftwareProduct @@ -58,7 +58,7 @@ class SoftwareProductCSVForm(CustomFieldModelCSVForm): fields = ("name",) -class SoftwareProductBulkEditForm(BootstrapMixin, AddRemoveTagsForm, CustomFieldModelBulkEditForm): +class SoftwareProductBulkEditForm(AddRemoveTagsForm, CustomFieldModelBulkEditForm): pk = forms.ModelMultipleChoiceField( queryset=SoftwareProduct.objects.all(), widget=forms.MultipleHiddenInput(), @@ -68,7 +68,7 @@ class SoftwareProductBulkEditForm(BootstrapMixin, AddRemoveTagsForm, CustomField nullable_fields = [] -class SoftwareProductVersionForm(BootstrapMixin, CustomFieldModelForm): +class SoftwareProductVersionForm(CustomFieldModelForm): """Form for creating a new SoftwareProductVersion object.""" name = forms.CharField(label=_("Version")) @@ -94,7 +94,7 @@ class SoftwareProductVersionForm(BootstrapMixin, CustomFieldModelForm): # return super(SoftwareProductVersionForm, self).clean() -class SoftwareProductVersionFilterForm(BootstrapMixin, CustomFieldModelFilterForm): +class SoftwareProductVersionFilterForm(CustomFieldModelFilterForm): """Form for filtering SoftwareProductVersion instances.""" model = SoftwareProductVersion @@ -115,7 +115,7 @@ class SoftwareProductVersionCSVForm(CustomFieldModelCSVForm): fields = ("name",) -class SoftwareProductVersionBulkEditForm(BootstrapMixin, AddRemoveTagsForm, CustomFieldModelBulkEditForm): +class SoftwareProductVersionBulkEditForm(AddRemoveTagsForm, CustomFieldModelBulkEditForm): pk = forms.ModelMultipleChoiceField( queryset=SoftwareProduct.objects.all(), widget=forms.MultipleHiddenInput(), @@ -125,7 +125,7 @@ class SoftwareProductVersionBulkEditForm(BootstrapMixin, AddRemoveTagsForm, Cust nullable_fields = [] -class SoftwareProductInstallationForm(BootstrapMixin, CustomFieldModelForm): +class SoftwareProductInstallationForm(CustomFieldModelForm): """Form for creating a new SoftwareProductInstallation object.""" device = DynamicModelChoiceField( @@ -176,7 +176,7 @@ class SoftwareProductInstallationForm(BootstrapMixin, CustomFieldModelForm): # return super(SoftwareProductInstallationForm, self).clean() -class SoftwareProductInstallationFilterForm(BootstrapMixin, CustomFieldModelFilterForm): +class SoftwareProductInstallationFilterForm(CustomFieldModelFilterForm): """Form for filtering SoftwareProductInstallation instances.""" model = SoftwareProductInstallation @@ -192,7 +192,7 @@ class SoftwareProductInstallationCSVForm(CustomFieldModelCSVForm): fields = tuple() -class SoftwareProductInstallationBulkEditForm(BootstrapMixin, AddRemoveTagsForm, CustomFieldModelBulkEditForm): +class SoftwareProductInstallationBulkEditForm(AddRemoveTagsForm, CustomFieldModelBulkEditForm): pk = forms.ModelMultipleChoiceField( queryset=SoftwareProductInstallation.objects.all(), widget=forms.MultipleHiddenInput(),