minor changes: django.conf.settings over dojo.settings

Author: fopina

dojo/apps.py

@@ -1,6 +1,7 @@
 import logging
 
 from django.apps import AppConfig
+from django.conf import settings
 from django.core.checks import register as register_check
 from django.db import models
 from watson import search as watson
@@ -16,6 +17,12 @@ class DojoAppConfig(AppConfig):
     verbose_name = "Defect Dojo"
 
     def ready(self):
+        if settings.ENABLE_AUDITLOG:
+            from auditlog.registry import auditlog  # noqa: PLC0415 raised: AppRegistryNotReady
+
+            from dojo.location.models import Location  # noqa: PLC0415 raised: AppRegistryNotReady
+
+            auditlog.register(Location)
         # we need to initializer waston here because in models.py is to early if we want add extra fields to index
         # logger.info('ready(): initializing watson')
         # commented out ^ as it prints in manage.py dumpdata, docker logs and many other places

dojo/location/models.py

@@ -2,7 +2,6 @@
 
 from typing import TYPE_CHECKING, Self, TypeVar
 
-from auditlog.registry import auditlog
 from django.db import transaction
 from django.db.models import (
     CASCADE,
@@ -34,7 +33,6 @@
 )
 from dojo.location.status import FindingLocationStatus, ProductLocationStatus
 from dojo.models import Dojo_User, Finding, Product, _manage_inherited_tags, copy_model_util
-from dojo.settings import settings
 from dojo.tools.locations import LocationAssociationData
 
 if TYPE_CHECKING:
@@ -454,7 +452,3 @@ class Meta:
     def __str__(self) -> str:
         """Return the string representation of a LocationProductReference."""
         return f"{self.location} - Product: {self.product} ({self.status})"
-
-
-if settings.ENABLE_AUDITLOG:
-    auditlog.register(Location)

dojo/reports/widgets.py

@@ -3,6 +3,7 @@
 from collections import OrderedDict
 
 from django import forms
+from django.conf import settings
 from django.forms import Widget
 from django.forms.utils import flatatt
 from django.http import QueryDict
@@ -23,7 +24,6 @@
 from dojo.location.status import FindingLocationStatus
 from dojo.models import Endpoint, Finding
 from dojo.reports.queries import prefetch_related_endpoints_for_report, prefetch_related_findings_for_report
-from dojo.settings import settings
 from dojo.url.filters import URLFilter
 from dojo.utils import get_page_items, get_system_setting, get_words_for_field