From 1957f2c2948fb34024581a8ca9c02e95e3c6b96a Mon Sep 17 00:00:00 2001 From: Jeremy Stretch Date: Thu, 10 Apr 2025 08:59:28 -0400 Subject: [PATCH] Misc cleanup --- netbox/extras/api/serializers_/tableconfigs.py | 2 +- netbox/extras/forms/filtersets.py | 4 ++-- netbox/extras/graphql/types.py | 1 + 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/netbox/extras/api/serializers_/tableconfigs.py b/netbox/extras/api/serializers_/tableconfigs.py index 6a59048df..6f5af136a 100644 --- a/netbox/extras/api/serializers_/tableconfigs.py +++ b/netbox/extras/api/serializers_/tableconfigs.py @@ -19,4 +19,4 @@ class TableConfigSerializer(ValidatedModelSerializer): 'id', 'url', 'display_url', 'display', 'object_type', 'table', 'name', 'slug', 'description', 'user', 'weight', 'enabled', 'shared', 'columns', 'ordering', 'created', 'last_updated', ] - brief_fields = ('id', 'url', 'display', 'name', 'slug', 'description') + brief_fields = ('id', 'url', 'display', 'name', 'slug', 'description', 'object_type', 'table') diff --git a/netbox/extras/forms/filtersets.py b/netbox/extras/forms/filtersets.py index 358d43041..9ea5c3a98 100644 --- a/netbox/extras/forms/filtersets.py +++ b/netbox/extras/forms/filtersets.py @@ -253,9 +253,9 @@ class SavedFilterFilterForm(SavedFiltersMixin, FilterForm): class TableConfigFilterForm(SavedFiltersMixin, FilterForm): fieldsets = ( FieldSet('q', 'filter_id'), - FieldSet('object_type', 'enabled', 'shared', 'weight', name=_('Attributes')), + FieldSet('object_type_id', 'enabled', 'shared', 'weight', name=_('Attributes')), ) - object_type = ContentTypeMultipleChoiceField( + object_type_id = ContentTypeMultipleChoiceField( label=_('Object types'), queryset=ObjectType.objects.public(), required=False diff --git a/netbox/extras/graphql/types.py b/netbox/extras/graphql/types.py index 44a3fb29f..4bd836f6b 100644 --- a/netbox/extras/graphql/types.py +++ b/netbox/extras/graphql/types.py @@ -189,6 +189,7 @@ class SubscriptionType(ObjectType): @strawberry_django.type( models.TableConfig, + fields='__all__', filters=TableConfigFilter, pagination=True )