From bf90f746f23c0cd1153c3c707d99a23005257bc2 Mon Sep 17 00:00:00 2001 From: Jeremy Stretch Date: Tue, 8 Jul 2025 09:06:32 -0400 Subject: [PATCH] Misc cleanup --- netbox/core/models/contenttypes.py | 1 - netbox/extras/api/serializers_/objecttypes.py | 4 ++++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/netbox/core/models/contenttypes.py b/netbox/core/models/contenttypes.py index 2a65c523a..a7d5c91af 100644 --- a/netbox/core/models/contenttypes.py +++ b/netbox/core/models/contenttypes.py @@ -70,7 +70,6 @@ class ObjectType(ContentType): def model_verbose_name_plural(self): if model := self.model_class(): return model._meta.verbose_name_plural - return model._meta.label @property def is_plugin_model(self): diff --git a/netbox/extras/api/serializers_/objecttypes.py b/netbox/extras/api/serializers_/objecttypes.py index 61c6844c3..e272509ec 100644 --- a/netbox/extras/api/serializers_/objecttypes.py +++ b/netbox/extras/api/serializers_/objecttypes.py @@ -1,6 +1,8 @@ import inspect from django.urls import NoReverseMatch, reverse +from drf_spectacular.types import OpenApiTypes +from drf_spectacular.utils import extend_schema_field from rest_framework import serializers from core.models import ObjectType @@ -28,6 +30,7 @@ class ObjectTypeSerializer(BaseModelSerializer): 'is_plugin_model', 'rest_api_endpoint', 'description', ] + @extend_schema_field(OpenApiTypes.STR) def get_rest_api_endpoint(self, obj): if not (model := obj.model_class()): return @@ -37,6 +40,7 @@ class ObjectTypeSerializer(BaseModelSerializer): except NoReverseMatch: return + @extend_schema_field(OpenApiTypes.STR) def get_description(self, obj): if not (model := obj.model_class()): return