Просмотр исходного кода

Remove obsolete utility function model_names_to_filter_dict()

Jeremy Stretch 6 лет назад
Родитель
Сommit
c28684a8b3
4 измененных файлов с 1 добавлено и 14 удалено
  1. 0 1
      netbox/extras/api/serializers.py
  2. 1 1
      netbox/extras/models.py
  3. 0 1
      netbox/extras/tests/test_api.py
  4. 0 11
      netbox/utilities/utils.py

+ 0 - 1
netbox/extras/api/serializers.py

@@ -20,7 +20,6 @@ from utilities.api import (
     ChoiceField, ContentTypeField, get_serializer_for_model, SerializerNotFound, SerializedPKRelatedField,
     ChoiceField, ContentTypeField, get_serializer_for_model, SerializerNotFound, SerializedPKRelatedField,
     ValidatedModelSerializer,
     ValidatedModelSerializer,
 )
 )
-from utilities.utils import model_names_to_filter_dict
 from .nested_serializers import *
 from .nested_serializers import *
 
 
 
 

+ 1 - 1
netbox/extras/models.py

@@ -13,7 +13,7 @@ from django.urls import reverse
 from taggit.models import TagBase, GenericTaggedItemBase
 from taggit.models import TagBase, GenericTaggedItemBase
 
 
 from utilities.fields import ColorField
 from utilities.fields import ColorField
-from utilities.utils import deepmerge, model_names_to_filter_dict, render_jinja2
+from utilities.utils import deepmerge, render_jinja2
 from .choices import *
 from .choices import *
 from .constants import *
 from .constants import *
 from .querysets import ConfigContextQuerySet
 from .querysets import ConfigContextQuerySet

+ 0 - 1
netbox/extras/tests/test_api.py

@@ -13,7 +13,6 @@ from extras.models import ConfigContext, Graph, ExportTemplate, Tag
 from extras.scripts import BooleanVar, IntegerVar, Script, StringVar
 from extras.scripts import BooleanVar, IntegerVar, Script, StringVar
 from tenancy.models import Tenant, TenantGroup
 from tenancy.models import Tenant, TenantGroup
 from utilities.testing import APITestCase, choices_to_dict
 from utilities.testing import APITestCase, choices_to_dict
-from utilities.utils import model_names_to_filter_dict
 
 
 
 
 class ChoicesTest(APITestCase):
 class ChoicesTest(APITestCase):

+ 0 - 11
netbox/utilities/utils.py

@@ -62,17 +62,6 @@ def dynamic_import(name):
     return mod
     return mod
 
 
 
 
-def model_names_to_filter_dict(names):
-    """
-    Accept a list of content types in the format ['<app>.<model>', '<app>.<model>', ...] and return a dictionary
-    suitable for QuerySet filtering.
-    """
-    # TODO: This should match on the app_label as well as the model name to avoid potential duplicate names
-    return {
-        'model__in': [model.split('.')[1] for model in names],
-    }
-
-
 def get_subquery(model, field):
 def get_subquery(model, field):
     """
     """
     Return a Subquery suitable for annotating a child object count.
     Return a Subquery suitable for annotating a child object count.