diff --git a/netbox/extras/tests/test_api.py b/netbox/extras/tests/test_api.py index c19822972..65b476595 100644 --- a/netbox/extras/tests/test_api.py +++ b/netbox/extras/tests/test_api.py @@ -277,7 +277,7 @@ class CustomFieldChoiceSetTest(APIViewTestCases.APIViewTestCase): ] } - response = self.client.post(self.url_list, data, format='json', **self.header) + response = self.client.post(self._get_list_url(), data, format='json', **self.header) self.assertEqual(response.status_code, 400) diff --git a/netbox/netbox/authentication/__init__.py b/netbox/netbox/authentication/__init__.py index e5b178d84..19b1e58ca 100644 --- a/netbox/netbox/authentication/__init__.py +++ b/netbox/netbox/authentication/__init__.py @@ -1,7 +1,6 @@ import logging from collections import defaultdict -from django.apps import apps from django.conf import settings from django.contrib.auth.backends import ModelBackend from django.contrib.auth.backends import RemoteUserBackend as _RemoteUserBackend @@ -141,15 +140,9 @@ class ObjectPermissionMixin: # Sanity check: Ensure that the requested permission applies to the specified object model = obj._meta.concrete_model if model._meta.label_lower != '.'.join((app_label, model_name)): - # Allow proxy models: the permission may name a proxy whose concrete model matches - try: - perm_model = apps.get_model(app_label, model_name) - except LookupError: - perm_model = None - if perm_model is None or perm_model._meta.concrete_model != model: - raise ValueError(_("Invalid permission {permission} for model {model}").format( - permission=perm, model=model - )) + raise ValueError(_("Invalid permission {permission} for model {model}").format( + permission=perm, model=model + )) # Compile a QuerySet filter that matches all instances of the specified model tokens = {