Преглед на файлове

Closes #10697: Move application registry into core app

jeremystretch преди 3 години
родител
ревизия
81c0dce5a3

+ 1 - 0
docs/release-notes/version-3.4.md

@@ -56,6 +56,7 @@ A new `PluginMenu` class has been introduced, which enables a plugin to inject a
 * [#9045](https://github.com/netbox-community/netbox/issues/9045) - Remove legacy ASN field from provider model
 * [#9046](https://github.com/netbox-community/netbox/issues/9046) - Remove legacy contact fields from provider model
 * [#10358](https://github.com/netbox-community/netbox/issues/10358) - Raise minimum required PostgreSQL version from 10 to 11
+* [#10697](https://github.com/netbox-community/netbox/issues/10697) - Move application registry into core app
 * [#10699](https://github.com/netbox-community/netbox/issues/10699) - Remove custom `import_object()` function
 * [#10816](https://github.com/netbox-community/netbox/issues/10816) - Pass the current request when instantiating a FilterSet within UI views
 

+ 1 - 1
netbox/extras/management/commands/reindex.py

@@ -1,7 +1,7 @@
 from django.contrib.contenttypes.models import ContentType
 from django.core.management.base import BaseCommand, CommandError
 
-from extras.registry import registry
+from netbox.registry import registry
 from netbox.search.backends import search_backend
 
 

+ 1 - 1
netbox/extras/plugins/__init__.py

@@ -7,8 +7,8 @@ from django.core.exceptions import ImproperlyConfigured
 from django.template.loader import get_template
 from django.utils.module_loading import import_string
 
-from extras.registry import registry
 from netbox.navigation import MenuGroup
+from netbox.registry import registry
 from netbox.search import register_search
 from utilities.choices import ButtonColorChoices
 

+ 1 - 1
netbox/extras/templatetags/plugins.py

@@ -3,7 +3,7 @@ from django.conf import settings
 from django.utils.safestring import mark_safe
 
 from extras.plugins import PluginTemplateExtension
-from extras.registry import registry
+from netbox.registry import registry
 
 register = template_.Library()
 

+ 1 - 1
netbox/extras/tests/test_plugins.py

@@ -6,9 +6,9 @@ from django.test import Client, TestCase, override_settings
 from django.urls import reverse
 
 from extras.plugins import PluginMenu
-from extras.registry import registry
 from extras.tests.dummy_plugin import config as dummy_config
 from netbox.graphql.schema import Query
+from netbox.registry import registry
 
 
 @skipIf('extras.tests.dummy_plugin' not in settings.PLUGINS, "dummy_plugin not in settings.PLUGINS")

+ 1 - 1
netbox/extras/utils.py

@@ -3,7 +3,7 @@ from django.utils.deconstruct import deconstructible
 from taggit.managers import _TaggableManager
 
 from extras.constants import EXTRAS_FEATURES
-from extras.registry import registry
+from netbox.registry import registry
 
 
 def is_taggable(obj):

+ 1 - 1
netbox/extras/webhooks.py

@@ -5,11 +5,11 @@ from django.contrib.contenttypes.models import ContentType
 from django.utils import timezone
 from django_rq import get_queue
 
+from netbox.registry import registry
 from utilities.api import get_serializer_for_model
 from utilities.utils import serialize_object
 from .choices import *
 from .models import Webhook
-from .registry import registry
 
 
 def serialize_for_webhook(instance):

+ 1 - 1
netbox/netbox/context_processors.py

@@ -1,7 +1,7 @@
 from django.conf import settings as django_settings
 
-from extras.registry import registry
 from netbox.config import get_config
+from netbox.registry import registry
 
 
 def settings_and_registry(request):

+ 1 - 1
netbox/netbox/denormalized.py

@@ -3,7 +3,7 @@ import logging
 from django.db.models.signals import post_save
 from django.dispatch import receiver
 
-from extras.registry import registry
+from netbox.registry import registry
 
 
 logger = logging.getLogger('netbox.denormalized')

+ 1 - 1
netbox/netbox/graphql/schema.py

@@ -3,8 +3,8 @@ import graphene
 from circuits.graphql.schema import CircuitsQuery
 from dcim.graphql.schema import DCIMQuery
 from extras.graphql.schema import ExtrasQuery
-from extras.registry import registry
 from ipam.graphql.schema import IPAMQuery
+from netbox.registry import registry
 from tenancy.graphql.schema import TenancyQuery
 from users.graphql.schema import UsersQuery
 from virtualization.graphql.schema import VirtualizationQuery

+ 1 - 1
netbox/netbox/navigation/menu.py

@@ -1,4 +1,4 @@
-from extras.registry import registry
+from netbox.registry import registry
 from . import *
 
 

+ 1 - 1
netbox/netbox/preferences.py

@@ -1,4 +1,4 @@
-from extras.registry import registry
+from netbox.registry import registry
 from users.preferences import UserPreference
 from utilities.paginator import EnhancedPaginator
 

+ 0 - 0
netbox/extras/registry.py → netbox/netbox/registry.py


+ 1 - 1
netbox/netbox/search/__init__.py

@@ -2,7 +2,7 @@ from collections import namedtuple
 
 from django.db import models
 
-from extras.registry import registry
+from netbox.registry import registry
 
 ObjectFieldValue = namedtuple('ObjectFieldValue', ('name', 'type', 'weight', 'value'))
 

+ 1 - 1
netbox/netbox/search/backends.py

@@ -9,7 +9,7 @@ from django.db.models.signals import post_delete, post_save
 from django.utils.module_loading import import_string
 
 from extras.models import CachedValue, CustomField
-from extras.registry import registry
+from netbox.registry import registry
 from utilities.querysets import RestrictedPrefetch
 from utilities.templatetags.builtins.filters import bettertitle
 from . import FieldTypes, LookupTypes, get_indexer

+ 1 - 1
netbox/extras/tests/test_registry.py → netbox/netbox/tests/test_registry.py

@@ -1,6 +1,6 @@
 from django.test import TestCase
 
-from extras.registry import Registry
+from netbox.registry import Registry
 
 
 class RegistryTest(TestCase):

+ 1 - 1
netbox/utilities/templatetags/tabs.py

@@ -2,7 +2,7 @@ from django import template
 from django.urls import reverse
 from django.utils.module_loading import import_string
 
-from extras.registry import registry
+from netbox.registry import registry
 
 register = template.Library()
 

+ 1 - 1
netbox/utilities/urls.py

@@ -2,7 +2,7 @@ from django.urls import path
 from django.utils.module_loading import import_string
 from django.views.generic import View
 
-from extras.registry import registry
+from netbox.registry import registry
 
 
 def get_model_urls(app_label, model_name):

+ 1 - 1
netbox/utilities/views.py

@@ -3,7 +3,7 @@ from django.core.exceptions import ImproperlyConfigured
 from django.urls import reverse
 from django.urls.exceptions import NoReverseMatch
 
-from extras.registry import registry
+from netbox.registry import registry
 from .permissions import resolve_permission
 
 __all__ = (