NeoAnd/netbox
1
0
Fork 0
mirror of https://github.com/netbox-community/netbox.git synced 2025-08-09 00:58:16 -06:00
Code Issues Actions 10 Packages Projects Releases Wiki Activity

15156 review changes

Browse Source
This commit is contained in:
Arthur Hanson 2024-06-20 09:30:54 -07:00
parent 80b8fa60e3
commit 1ff4e165e3
8 changed files with 10 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
netbox/dcim/api/serializers_/cables.py
View File

@ -7,7 +7,7 @@ from dcim.choices import *
from dcim.constants import * from dcim.constants import *
from dcim.models import Cable, CablePath, CableTermination from dcim.models import Cable, CablePath, CableTermination
from netbox.api.fields import ChoiceField, ContentTypeField 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 tenancy.api.serializers_.tenants import TenantSerializer
from utilities.api import get_serializer_for_model from utilities.api import get_serializer_for_model
@ -37,12 +37,10 @@ class CableSerializer(NetBoxModelSerializer):
brief_fields = ('id', 'url', 'display', 'label', 'description') brief_fields = ('id', 'url', 'display', 'label', 'description')
class TracedCableSerializer(serializers.ModelSerializer): class TracedCableSerializer(BaseModelSerializer):
""" """
Used only while tracing a cable path. 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: class Meta:
model = Cable model = Cable

6
netbox/extras/api/nested_serializers.py
View File

@ -85,19 +85,17 @@ class NestedSavedFilterSerializer(WritableNestedSerializer):
class NestedBookmarkSerializer(WritableNestedSerializer): class NestedBookmarkSerializer(WritableNestedSerializer):
display_url = serializers.CharField(allow_null=True, read_only=True)
class Meta: class Meta:
model = models.Bookmark model = models.Bookmark
fields = ['id', 'url', 'display_url', 'display', 'object_id', 'object_type'] fields = ['id', 'url', 'display', 'object_id', 'object_type']
class NestedImageAttachmentSerializer(WritableNestedSerializer): class NestedImageAttachmentSerializer(WritableNestedSerializer):
display_url = serializers.CharField(allow_null=True, read_only=True)
class Meta: class Meta:
model = models.ImageAttachment model = models.ImageAttachment
fields = ['id', 'url', 'display_url', 'display', 'name', 'image'] fields = ['id', 'url', 'display', 'name', 'image']
class NestedJournalEntrySerializer(WritableNestedSerializer): class NestedJournalEntrySerializer(WritableNestedSerializer):

3
netbox/extras/api/serializers_/attachments.py
View File

@ -14,7 +14,6 @@ __all__ = (
class ImageAttachmentSerializer(ValidatedModelSerializer): class ImageAttachmentSerializer(ValidatedModelSerializer):
display_url = serializers.CharField(allow_null=True, read_only=True)
object_type = ContentTypeField( object_type = ContentTypeField(
queryset=ObjectType.objects.all() queryset=ObjectType.objects.all()
) )
@ -23,7 +22,7 @@ class ImageAttachmentSerializer(ValidatedModelSerializer):
class Meta: class Meta:
model = ImageAttachment model = ImageAttachment
fields = [ 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', 'image_height', 'image_width', 'created', 'last_updated',
] ]
brief_fields = ('id', 'url', 'display', 'name', 'image') brief_fields = ('id', 'url', 'display', 'name', 'image')

3
netbox/extras/api/serializers_/bookmarks.py
View File

@ -14,7 +14,6 @@ __all__ = (
class BookmarkSerializer(ValidatedModelSerializer): class BookmarkSerializer(ValidatedModelSerializer):
display_url = serializers.CharField(allow_null=True, read_only=True)
object_type = ContentTypeField( object_type = ContentTypeField(
queryset=ObjectType.objects.with_feature('bookmarks'), queryset=ObjectType.objects.with_feature('bookmarks'),
) )
@ -24,7 +23,7 @@ class BookmarkSerializer(ValidatedModelSerializer):
class Meta: class Meta:
model = Bookmark model = Bookmark
fields = [ 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') brief_fields = ('id', 'url', 'display', 'object_id', 'object_type')

3
netbox/extras/api/serializers_/objecttypes.py
View File

@ -10,8 +10,7 @@ __all__ = (
class ObjectTypeSerializer(BaseModelSerializer): class ObjectTypeSerializer(BaseModelSerializer):
url = serializers.HyperlinkedIdentityField(view_name='extras-api:objecttype-detail') url = serializers.HyperlinkedIdentityField(view_name='extras-api:objecttype-detail')
display_url = serializers.CharField(allow_null=True, read_only=True)
class Meta: class Meta:
model = ObjectType model = ObjectType
fields = ['id', 'url', 'display_url', 'display', 'app_label', 'model'] fields = ['id', 'url', 'display', 'app_label', 'model']

3
netbox/ipam/api/serializers_/fhrpgroups.py
View File

@ -27,7 +27,6 @@ class FHRPGroupSerializer(NetBoxModelSerializer):
class FHRPGroupAssignmentSerializer(NetBoxModelSerializer): class FHRPGroupAssignmentSerializer(NetBoxModelSerializer):
display_url = serializers.CharField(allow_null=True, read_only=True)
group = FHRPGroupSerializer(nested=True) group = FHRPGroupSerializer(nested=True)
interface_type = ContentTypeField( interface_type = ContentTypeField(
queryset=ContentType.objects.all() queryset=ContentType.objects.all()
@ -37,7 +36,7 @@ class FHRPGroupAssignmentSerializer(NetBoxModelSerializer):
class Meta: class Meta:
model = FHRPGroupAssignment model = FHRPGroupAssignment
fields = [ 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', 'priority', 'created', 'last_updated',
] ]
brief_fields = ('id', 'url', 'display', 'group', 'interface_type', 'interface_id', 'priority') brief_fields = ('id', 'url', 'display', 'group', 'interface_type', 'interface_id', 'priority')

3
netbox/tenancy/api/nested_serializers.py
View File

@ -68,10 +68,9 @@ class NestedContactSerializer(WritableNestedSerializer):
class NestedContactAssignmentSerializer(WritableNestedSerializer): class NestedContactAssignmentSerializer(WritableNestedSerializer):
display_url = serializers.CharField(allow_null=True, read_only=True)
contact = NestedContactSerializer() contact = NestedContactSerializer()
role = NestedContactRoleSerializer role = NestedContactRoleSerializer
class Meta: class Meta:
model = ContactAssignment model = ContactAssignment
fields = ['id', 'url', 'display_url', 'display', 'contact', 'role', 'priority'] fields = ['id', 'url', 'display', 'contact', 'role', 'priority']

3
netbox/tenancy/api/serializers_/contacts.py
View File

@ -55,7 +55,6 @@ class ContactSerializer(NetBoxModelSerializer):
class ContactAssignmentSerializer(NetBoxModelSerializer): class ContactAssignmentSerializer(NetBoxModelSerializer):
display_url = serializers.CharField(allow_null=True, read_only=True)
object_type = ContentTypeField( object_type = ContentTypeField(
queryset=ContentType.objects.all() queryset=ContentType.objects.all()
) )
@ -67,7 +66,7 @@ class ContactAssignmentSerializer(NetBoxModelSerializer):
class Meta: class Meta:
model = ContactAssignment model = ContactAssignment
fields = [ 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', 'tags', 'custom_fields', 'created', 'last_updated',
] ]
brief_fields = ('id', 'url', 'display', 'contact', 'role', 'priority') brief_fields = ('id', 'url', 'display', 'contact', 'role', 'priority')