Merge v3.1.7

2022-02-03 12:55:34 -05:00
parent 74c4f12b27 795134c084
commit 478eefb74c
56 changed files with 758 additions and 142 deletions
--- a/netbox/extras/tests/test_api.py
+++ b/netbox/extras/tests/test_api.py
@@ -615,7 +615,6 @@ class CreatedUpdatedFilterTest(APITestCase):

 class ContentTypeTest(APITestCase):

-    @override_settings(EXEMPT_VIEW_PERMISSIONS=['contenttypes.contenttype'])
    def test_list_objects(self):
        contenttype_count = ContentType.objects.count()

@@ -623,7 +622,6 @@ class ContentTypeTest(APITestCase):
        self.assertHttpStatus(response, status.HTTP_200_OK)
        self.assertEqual(response.data['count'], contenttype_count)

-    @override_settings(EXEMPT_VIEW_PERMISSIONS=['contenttypes.contenttype'])
    def test_get_object(self):
        contenttype = ContentType.objects.first()