@@ -20,7 +20,6 @@ from utilities.api import (
ChoiceField, ContentTypeField, get_serializer_for_model, SerializerNotFound, SerializedPKRelatedField,
ValidatedModelSerializer,
)
-from utilities.utils import model_names_to_filter_dict
from .nested_serializers import *
@@ -13,7 +13,7 @@ from django.urls import reverse
from taggit.models import TagBase, GenericTaggedItemBase
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 .constants import *
from .querysets import ConfigContextQuerySet
@@ -13,7 +13,6 @@ from extras.models import ConfigContext, Graph, ExportTemplate, Tag
from extras.scripts import BooleanVar, IntegerVar, Script, StringVar
from tenancy.models import Tenant, TenantGroup
from utilities.testing import APITestCase, choices_to_dict
class ChoicesTest(APITestCase):
@@ -62,17 +62,6 @@ def dynamic_import(name):
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):
"""
Return a Subquery suitable for annotating a child object count.