From 4ef24cae4a99fe5823078d4fa309c9a8061d3a35 Mon Sep 17 00:00:00 2001 From: Matthias Mair Date: Wed, 15 Oct 2025 00:12:06 +0200 Subject: [PATCH] simplify more --- src/backend/InvenTree/InvenTree/serializers.py | 11 ++--------- src/backend/InvenTree/common/serializers.py | 3 +-- src/backend/InvenTree/part/serializers.py | 2 +- 3 files changed, 4 insertions(+), 12 deletions(-) diff --git a/src/backend/InvenTree/InvenTree/serializers.py b/src/backend/InvenTree/InvenTree/serializers.py index dd92729968..ece4325403 100644 --- a/src/backend/InvenTree/InvenTree/serializers.py +++ b/src/backend/InvenTree/InvenTree/serializers.py @@ -381,8 +381,8 @@ class DependentField(serializers.Field): return None -class BareInvenTreeModelSerializer(serializers.ModelSerializer): - """Inherits the standard Django ModelSerializer class, but also ensures that the underlying model class data are checked on validation. Without Filtering support.""" +class InvenTreeModelSerializer(FilterableSerializerField, serializers.ModelSerializer): + """Inherits the standard Django ModelSerializer class, but also ensures that the underlying model class data are checked on validation.""" # Switch out URLField mapping serializer_field_mapping = { @@ -547,13 +547,6 @@ class BareInvenTreeModelSerializer(serializers.ModelSerializer): return data -class InvenTreeModelSerializer(FilterableSerializerField, BareInvenTreeModelSerializer): - """Inherits the standard Django ModelSerializer class, but also ensures that the underlying model class data are checked on validation. - - This field allows filtering. - """ - - class InvenTreeTaggitSerializer(TaggitSerializer): """Updated from https://github.com/glemmaPaul/django-taggit-serializer.""" diff --git a/src/backend/InvenTree/common/serializers.py b/src/backend/InvenTree/common/serializers.py index d408ea3502..f45e652a90 100644 --- a/src/backend/InvenTree/common/serializers.py +++ b/src/backend/InvenTree/common/serializers.py @@ -22,7 +22,6 @@ from InvenTree.helpers import get_objectreference from InvenTree.helpers_model import construct_absolute_url from InvenTree.mixins import DataImportExportSerializerMixin from InvenTree.serializers import ( - BareInvenTreeModelSerializer, InvenTreeAttachmentSerializerField, InvenTreeImageSerializerField, InvenTreeModelSerializer, @@ -72,7 +71,7 @@ class SettingsValueField(serializers.Field): return str(data) -class SettingsSerializer(BareInvenTreeModelSerializer): +class SettingsSerializer(InvenTreeModelSerializer): """Base serializer for a settings object.""" key = serializers.CharField(read_only=True) diff --git a/src/backend/InvenTree/part/serializers.py b/src/backend/InvenTree/part/serializers.py index 18a300998b..2860741a32 100644 --- a/src/backend/InvenTree/part/serializers.py +++ b/src/backend/InvenTree/part/serializers.py @@ -632,7 +632,7 @@ class PartSerializer( InvenTree.serializers.NotesFieldMixin, InvenTree.serializers.RemoteImageMixin, InvenTree.serializers.InvenTreeTaggitSerializer, - InvenTree.serializers.BareInvenTreeModelSerializer, + InvenTree.serializers.InvenTreeModelSerializer, ): """Serializer for complete detail information of a part.