From 1ff4e165e37610538053bc96accef838080af607 Mon Sep 17 00:00:00 2001 From: Arthur Hanson Date: Thu, 20 Jun 2024 09:30:54 -0700 Subject: [PATCH] 15156 review changes --- netbox/dcim/api/serializers_/cables.py | 6 ++---- netbox/extras/api/nested_serializers.py | 6 ++---- netbox/extras/api/serializers_/attachments.py | 3 +-- netbox/extras/api/serializers_/bookmarks.py | 3 +-- netbox/extras/api/serializers_/objecttypes.py | 3 +-- netbox/ipam/api/serializers_/fhrpgroups.py | 3 +-- netbox/tenancy/api/nested_serializers.py | 3 +-- netbox/tenancy/api/serializers_/contacts.py | 3 +-- 8 files changed, 10 insertions(+), 20 deletions(-) diff --git a/netbox/dcim/api/serializers_/cables.py b/netbox/dcim/api/serializers_/cables.py index 970d744dc..53dc3a0d6 100644 --- a/netbox/dcim/api/serializers_/cables.py +++ b/netbox/dcim/api/serializers_/cables.py @@ -7,7 +7,7 @@ from dcim.choices import * from dcim.constants import * from dcim.models import Cable, CablePath, CableTermination from netbox.api.fields import ChoiceField, ContentTypeField -from netbox.api.serializers import GenericObjectSerializer, NetBoxModelSerializer +from netbox.api.serializers import BaseModelSerializer, GenericObjectSerializer, NetBoxModelSerializer from tenancy.api.serializers_.tenants import TenantSerializer from utilities.api import get_serializer_for_model @@ -37,12 +37,10 @@ class CableSerializer(NetBoxModelSerializer): brief_fields = ('id', 'url', 'display', 'label', 'description') -class TracedCableSerializer(serializers.ModelSerializer): +class TracedCableSerializer(BaseModelSerializer): """ Used only while tracing a cable path. """ - url = serializers.HyperlinkedIdentityField(view_name='dcim-api:cable-detail') - display_url = serializers.HyperlinkedIdentityField(view_name='dcim:cable') class Meta: model = Cable diff --git a/netbox/extras/api/nested_serializers.py b/netbox/extras/api/nested_serializers.py index 5b8394aaa..3904493c0 100644 --- a/netbox/extras/api/nested_serializers.py +++ b/netbox/extras/api/nested_serializers.py @@ -85,19 +85,17 @@ class NestedSavedFilterSerializer(WritableNestedSerializer): class NestedBookmarkSerializer(WritableNestedSerializer): - display_url = serializers.CharField(allow_null=True, read_only=True) class Meta: model = models.Bookmark - fields = ['id', 'url', 'display_url', 'display', 'object_id', 'object_type'] + fields = ['id', 'url', 'display', 'object_id', 'object_type'] class NestedImageAttachmentSerializer(WritableNestedSerializer): - display_url = serializers.CharField(allow_null=True, read_only=True) class Meta: model = models.ImageAttachment - fields = ['id', 'url', 'display_url', 'display', 'name', 'image'] + fields = ['id', 'url', 'display', 'name', 'image'] class NestedJournalEntrySerializer(WritableNestedSerializer): diff --git a/netbox/extras/api/serializers_/attachments.py b/netbox/extras/api/serializers_/attachments.py index e5b239849..0c6ce1f3a 100644 --- a/netbox/extras/api/serializers_/attachments.py +++ b/netbox/extras/api/serializers_/attachments.py @@ -14,7 +14,6 @@ __all__ = ( class ImageAttachmentSerializer(ValidatedModelSerializer): - display_url = serializers.CharField(allow_null=True, read_only=True) object_type = ContentTypeField( queryset=ObjectType.objects.all() ) @@ -23,7 +22,7 @@ class ImageAttachmentSerializer(ValidatedModelSerializer): class Meta: model = ImageAttachment fields = [ - 'id', 'url', 'display_url', 'display', 'object_type', 'object_id', 'parent', 'name', 'image', + 'id', 'url', 'display', 'object_type', 'object_id', 'parent', 'name', 'image', 'image_height', 'image_width', 'created', 'last_updated', ] brief_fields = ('id', 'url', 'display', 'name', 'image') diff --git a/netbox/extras/api/serializers_/bookmarks.py b/netbox/extras/api/serializers_/bookmarks.py index f881658c7..a404d83c3 100644 --- a/netbox/extras/api/serializers_/bookmarks.py +++ b/netbox/extras/api/serializers_/bookmarks.py @@ -14,7 +14,6 @@ __all__ = ( class BookmarkSerializer(ValidatedModelSerializer): - display_url = serializers.CharField(allow_null=True, read_only=True) object_type = ContentTypeField( queryset=ObjectType.objects.with_feature('bookmarks'), ) @@ -24,7 +23,7 @@ class BookmarkSerializer(ValidatedModelSerializer): class Meta: model = Bookmark fields = [ - 'id', 'url', 'display_url', 'display', 'object_type', 'object_id', 'object', 'user', 'created', + 'id', 'url', 'display', 'object_type', 'object_id', 'object', 'user', 'created', ] brief_fields = ('id', 'url', 'display', 'object_id', 'object_type') diff --git a/netbox/extras/api/serializers_/objecttypes.py b/netbox/extras/api/serializers_/objecttypes.py index 9f0b38819..8e4806652 100644 --- a/netbox/extras/api/serializers_/objecttypes.py +++ b/netbox/extras/api/serializers_/objecttypes.py @@ -10,8 +10,7 @@ __all__ = ( class ObjectTypeSerializer(BaseModelSerializer): url = serializers.HyperlinkedIdentityField(view_name='extras-api:objecttype-detail') - display_url = serializers.CharField(allow_null=True, read_only=True) class Meta: model = ObjectType - fields = ['id', 'url', 'display_url', 'display', 'app_label', 'model'] + fields = ['id', 'url', 'display', 'app_label', 'model'] diff --git a/netbox/ipam/api/serializers_/fhrpgroups.py b/netbox/ipam/api/serializers_/fhrpgroups.py index c11367da5..b5bebbc95 100644 --- a/netbox/ipam/api/serializers_/fhrpgroups.py +++ b/netbox/ipam/api/serializers_/fhrpgroups.py @@ -27,7 +27,6 @@ class FHRPGroupSerializer(NetBoxModelSerializer): class FHRPGroupAssignmentSerializer(NetBoxModelSerializer): - display_url = serializers.CharField(allow_null=True, read_only=True) group = FHRPGroupSerializer(nested=True) interface_type = ContentTypeField( queryset=ContentType.objects.all() @@ -37,7 +36,7 @@ class FHRPGroupAssignmentSerializer(NetBoxModelSerializer): class Meta: model = FHRPGroupAssignment fields = [ - 'id', 'url', 'display_url', 'display', 'group', 'interface_type', 'interface_id', 'interface', + 'id', 'url', 'display', 'group', 'interface_type', 'interface_id', 'interface', 'priority', 'created', 'last_updated', ] brief_fields = ('id', 'url', 'display', 'group', 'interface_type', 'interface_id', 'priority') diff --git a/netbox/tenancy/api/nested_serializers.py b/netbox/tenancy/api/nested_serializers.py index 7c2403a3f..d88e969aa 100644 --- a/netbox/tenancy/api/nested_serializers.py +++ b/netbox/tenancy/api/nested_serializers.py @@ -68,10 +68,9 @@ class NestedContactSerializer(WritableNestedSerializer): class NestedContactAssignmentSerializer(WritableNestedSerializer): - display_url = serializers.CharField(allow_null=True, read_only=True) contact = NestedContactSerializer() role = NestedContactRoleSerializer class Meta: model = ContactAssignment - fields = ['id', 'url', 'display_url', 'display', 'contact', 'role', 'priority'] + fields = ['id', 'url', 'display', 'contact', 'role', 'priority'] diff --git a/netbox/tenancy/api/serializers_/contacts.py b/netbox/tenancy/api/serializers_/contacts.py index 8009cb63f..b19622e14 100644 --- a/netbox/tenancy/api/serializers_/contacts.py +++ b/netbox/tenancy/api/serializers_/contacts.py @@ -55,7 +55,6 @@ class ContactSerializer(NetBoxModelSerializer): class ContactAssignmentSerializer(NetBoxModelSerializer): - display_url = serializers.CharField(allow_null=True, read_only=True) object_type = ContentTypeField( queryset=ContentType.objects.all() ) @@ -67,7 +66,7 @@ class ContactAssignmentSerializer(NetBoxModelSerializer): class Meta: model = ContactAssignment fields = [ - 'id', 'url', 'display_url', 'display', 'object_type', 'object_id', 'object', 'contact', 'role', 'priority', + 'id', 'url', 'display', 'object_type', 'object_id', 'object', 'contact', 'role', 'priority', 'tags', 'custom_fields', 'created', 'last_updated', ] brief_fields = ('id', 'url', 'display', 'contact', 'role', 'priority')