Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion netbox/utilities/api.py
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,7 @@ def get_view_name(view):
Derive the view name from its associated model, if it has one. Fall back to DRF's built-in `get_view_name()`.
This function is provided to DRF as its VIEW_NAME_FUNCTION.
"""
if hasattr(view, 'queryset'):
if hasattr(view, 'queryset') and view.queryset is not None:
# Derive the model name from the queryset.
name = title(view.queryset.model._meta.verbose_name)
if suffix := getattr(view, 'suffix', None):
Expand Down
19 changes: 18 additions & 1 deletion netbox/utilities/tests/test_api.py
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
from django.test import Client, TestCase, override_settings
from django.test import Client, TestCase, override_settings, tag
from django.urls import reverse
from drf_spectacular.drainage import GENERATOR_STATS
from rest_framework import status
Expand All @@ -9,6 +9,7 @@
from extras.models import CustomField
from ipam.models import VLAN
from netbox.config import get_config
from utilities.api import get_view_name
from utilities.testing import APITestCase, disable_warnings


Expand Down Expand Up @@ -267,3 +268,19 @@ def test_api_docs(self):
with GENERATOR_STATS.silence(): # Suppress schema generator warnings
response = self.client.get(url)
self.assertEqual(response.status_code, 200)


class GetViewNameTestCase(TestCase):

@tag('regression')
def test_get_view_name_with_none_queryset(self):
from rest_framework.viewsets import ReadOnlyModelViewSet

class MockViewSet(ReadOnlyModelViewSet):
queryset = None

view = MockViewSet()
view.suffix = 'List'

name = get_view_name(view)
self.assertEqual(name, 'Mock List')