@ -1,7 +1,7 @@
|
|||||||
from django import forms
|
from django import forms
|
||||||
from django.db.models import Q
|
from django.db.models import Q
|
||||||
|
|
||||||
from app import settings
|
from django.conf import settings
|
||||||
|
|
||||||
from access.models.tenant import Tenant as Organization
|
from access.models.tenant import Tenant as Organization
|
||||||
|
|
||||||
|
@ -7,7 +7,7 @@ from .team_users import TeamUsersForm, TeamUsers
|
|||||||
from access.models.team import Team
|
from access.models.team import Team
|
||||||
from access.functions import permissions
|
from access.functions import permissions
|
||||||
|
|
||||||
from app import settings
|
from django.conf import settings
|
||||||
|
|
||||||
from core.forms.common import CommonModelForm
|
from core.forms.common import CommonModelForm
|
||||||
|
|
||||||
|
@ -1,6 +1,6 @@
|
|||||||
from django.db.models import Q
|
from django.db.models import Q
|
||||||
|
|
||||||
from app import settings
|
from django.conf import settings
|
||||||
|
|
||||||
from access.models.team_user import TeamUsers
|
from access.models.team_user import TeamUsers
|
||||||
|
|
||||||
|
@ -4,7 +4,7 @@ from rest_framework import serializers
|
|||||||
|
|
||||||
from access.models.tenant import Tenant
|
from access.models.tenant import Tenant
|
||||||
|
|
||||||
from app.serializers.user import UserBaseSerializer
|
from centurion.serializers.user import UserBaseSerializer
|
||||||
|
|
||||||
from core import fields as centurion_field
|
from core import fields as centurion_field
|
||||||
|
|
||||||
|
@ -4,7 +4,7 @@ from access.models.organization_notes import OrganizationNotes
|
|||||||
|
|
||||||
from api.serializers import common
|
from api.serializers import common
|
||||||
|
|
||||||
from app.serializers.user import UserBaseSerializer
|
from centurion.serializers.user import UserBaseSerializer
|
||||||
|
|
||||||
from core.serializers.model_notes import (
|
from core.serializers.model_notes import (
|
||||||
ModelNotes,
|
ModelNotes,
|
||||||
|
@ -9,7 +9,7 @@ from access.serializers.organization import TenantBaseSerializer
|
|||||||
|
|
||||||
from api.serializers import common
|
from api.serializers import common
|
||||||
|
|
||||||
from app.serializers.permission import PermissionBaseSerializer
|
from centurion.serializers.permission import PermissionBaseSerializer
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
@ -4,7 +4,7 @@ from access.models.role_notes import RoleNotes
|
|||||||
|
|
||||||
from api.serializers import common
|
from api.serializers import common
|
||||||
|
|
||||||
from app.serializers.user import UserBaseSerializer
|
from centurion.serializers.user import UserBaseSerializer
|
||||||
|
|
||||||
from core.serializers.model_notes import (
|
from core.serializers.model_notes import (
|
||||||
ModelNotes,
|
ModelNotes,
|
||||||
|
@ -4,7 +4,7 @@ from access.models.team_notes import TeamNotes
|
|||||||
|
|
||||||
from api.serializers import common
|
from api.serializers import common
|
||||||
|
|
||||||
from app.serializers.user import UserBaseSerializer
|
from centurion.serializers.user import UserBaseSerializer
|
||||||
|
|
||||||
from core.serializers.model_notes import (
|
from core.serializers.model_notes import (
|
||||||
ModelNotes,
|
ModelNotes,
|
||||||
|
@ -6,7 +6,7 @@ from access.models.team_user import TeamUsers
|
|||||||
|
|
||||||
from api.serializers import common
|
from api.serializers import common
|
||||||
|
|
||||||
from app.serializers.user import UserBaseSerializer
|
from centurion.serializers.user import UserBaseSerializer
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
@ -9,7 +9,7 @@ from api.serializers import common
|
|||||||
from access.functions.permissions import permission_queryset
|
from access.functions.permissions import permission_queryset
|
||||||
from access.serializers.organization import TenantBaseSerializer
|
from access.serializers.organization import TenantBaseSerializer
|
||||||
|
|
||||||
from app.serializers.permission import Permission, PermissionBaseSerializer
|
from centurion.serializers.permission import Permission, PermissionBaseSerializer
|
||||||
|
|
||||||
from core import fields as centurion_field
|
from core import fields as centurion_field
|
||||||
|
|
||||||
|
@ -4,7 +4,7 @@ from django.db import models
|
|||||||
|
|
||||||
from access.models.entity import Entity
|
from access.models.entity import Entity
|
||||||
|
|
||||||
from app.tests.unit.test_unit_models import (
|
from centurion.tests.unit.test_unit_models import (
|
||||||
PyTestTenancyObjectInheritedCases,
|
PyTestTenancyObjectInheritedCases,
|
||||||
)
|
)
|
||||||
|
|
||||||
|
@ -15,7 +15,7 @@ from access.models.team import Team
|
|||||||
from access.models.team_user import TeamUsers
|
from access.models.team_user import TeamUsers
|
||||||
from access.tests.abstract.model_permissions_organization_manager import OrganizationManagerModelPermissionChange, OrganizationManagerModelPermissionView
|
from access.tests.abstract.model_permissions_organization_manager import OrganizationManagerModelPermissionChange, OrganizationManagerModelPermissionView
|
||||||
|
|
||||||
from app.tests.abstract.model_permissions import ModelPermissionsView, ModelPermissionsChange
|
from centurion.tests.abstract.model_permissions import ModelPermissionsView, ModelPermissionsChange
|
||||||
|
|
||||||
User = django.contrib.auth.get_user_model()
|
User = django.contrib.auth.get_user_model()
|
||||||
|
|
||||||
|
@ -4,7 +4,7 @@ import requests
|
|||||||
|
|
||||||
from django.test import TestCase
|
from django.test import TestCase
|
||||||
|
|
||||||
from app.tests.abstract.models import ModelDisplay, ModelIndex
|
from centurion.tests.abstract.models import ModelDisplay, ModelIndex
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
@ -2,7 +2,7 @@ from django.test import TestCase
|
|||||||
|
|
||||||
from access.models.role import Role
|
from access.models.role import Role
|
||||||
|
|
||||||
from app.tests.unit.test_unit_models import (
|
from centurion.tests.unit.test_unit_models import (
|
||||||
TenancyObjectInheritedCases
|
TenancyObjectInheritedCases
|
||||||
)
|
)
|
||||||
|
|
||||||
|
@ -14,7 +14,7 @@ from access.models.team import Team
|
|||||||
from access.models.team_user import TeamUsers
|
from access.models.team_user import TeamUsers
|
||||||
from access.tests.abstract.model_permissions_organization_manager import OrganizationManagerModelPermissions
|
from access.tests.abstract.model_permissions_organization_manager import OrganizationManagerModelPermissions
|
||||||
|
|
||||||
from app.tests.abstract.model_permissions import ModelPermissions
|
from centurion.tests.abstract.model_permissions import ModelPermissions
|
||||||
|
|
||||||
User = django.contrib.auth.get_user_model()
|
User = django.contrib.auth.get_user_model()
|
||||||
|
|
||||||
|
@ -4,7 +4,7 @@ import requests
|
|||||||
|
|
||||||
from django.test import TestCase
|
from django.test import TestCase
|
||||||
|
|
||||||
from app.tests.abstract.models import ModelAdd, ModelDelete, ModelDisplay
|
from centurion.tests.abstract.models import ModelAdd, ModelDelete, ModelDisplay
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
@ -4,7 +4,7 @@ from django.test import TestCase
|
|||||||
|
|
||||||
from access.models.team import Team
|
from access.models.team import Team
|
||||||
|
|
||||||
from app.tests.unit.test_unit_models import (
|
from centurion.tests.unit.test_unit_models import (
|
||||||
TenancyObjectInheritedCases
|
TenancyObjectInheritedCases
|
||||||
)
|
)
|
||||||
|
|
||||||
|
@ -15,7 +15,7 @@ from access.models.team_user import TeamUsers
|
|||||||
|
|
||||||
from access.tests.abstract.model_permissions_organization_manager import OrganizationManagerModelPermissionAdd, OrganizationManagerModelPermissionDelete
|
from access.tests.abstract.model_permissions_organization_manager import OrganizationManagerModelPermissionAdd, OrganizationManagerModelPermissionDelete
|
||||||
|
|
||||||
from app.tests.abstract.model_permissions import ModelPermissionsAdd, ModelPermissionsChange, ModelPermissionsDelete
|
from centurion.tests.abstract.model_permissions import ModelPermissionsAdd, ModelPermissionsChange, ModelPermissionsDelete
|
||||||
|
|
||||||
User = django.contrib.auth.get_user_model()
|
User = django.contrib.auth.get_user_model()
|
||||||
|
|
||||||
|
@ -4,7 +4,7 @@ import requests
|
|||||||
|
|
||||||
from django.test import TestCase
|
from django.test import TestCase
|
||||||
|
|
||||||
from app.tests.abstract.models import AddView, DeleteView
|
from centurion.tests.abstract.models import AddView, DeleteView
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
@ -5,7 +5,7 @@ from access.models.tenant import Tenant as Organization
|
|||||||
from access.models.team import Team
|
from access.models.team import Team
|
||||||
from access.models.team_user import TeamUsers
|
from access.models.team_user import TeamUsers
|
||||||
|
|
||||||
from app.tests.unit.test_unit_models import NonTenancyObjectInheritedCases
|
from centurion.tests.unit.test_unit_models import NonTenancyObjectInheritedCases
|
||||||
|
|
||||||
User = django.contrib.auth.get_user_model()
|
User = django.contrib.auth.get_user_model()
|
||||||
|
|
||||||
|
@ -617,7 +617,7 @@ class TenancyObjectInheritedCases(
|
|||||||
"""Test Cases for models that inherit from
|
"""Test Cases for models that inherit from
|
||||||
|
|
||||||
**Note:** dont use these test cases use
|
**Note:** dont use these test cases use
|
||||||
`app.tests.unit.test_unit_models.TenancyObjectInheritedCases` instead
|
`centurion.tests.unit.test_unit_models.TenancyObjectInheritedCases` instead
|
||||||
|
|
||||||
access.models.tenancy.TenancyObject"""
|
access.models.tenancy.TenancyObject"""
|
||||||
|
|
||||||
|
@ -4,7 +4,7 @@ from django.db import models
|
|||||||
|
|
||||||
from accounting.models.asset_base import AssetBase
|
from accounting.models.asset_base import AssetBase
|
||||||
|
|
||||||
from app.tests.unit.test_unit_models import (
|
from centurion.tests.unit.test_unit_models import (
|
||||||
PyTestTenancyObjectInheritedCases,
|
PyTestTenancyObjectInheritedCases,
|
||||||
)
|
)
|
||||||
|
|
||||||
|
@ -3,7 +3,7 @@ from django import forms
|
|||||||
|
|
||||||
from api.models.tokens import AuthToken
|
from api.models.tokens import AuthToken
|
||||||
|
|
||||||
from app import settings
|
from django.conf import settings
|
||||||
|
|
||||||
from core.forms.common import CommonModelForm
|
from core.forms.common import CommonModelForm
|
||||||
|
|
||||||
|
@ -35,7 +35,7 @@ class AuthToken(models.Model):
|
|||||||
def validate_note_no_token(self, note, token, raise_exception = True) -> bool:
|
def validate_note_no_token(self, note, token, raise_exception = True) -> bool:
|
||||||
""" Ensure plaintext token cant be saved to notes field.
|
""" Ensure plaintext token cant be saved to notes field.
|
||||||
|
|
||||||
called from app.settings.views.user_settings.TokenAdd.form_valid()
|
called from centurion.settings.views.user_settings.TokenAdd.form_valid()
|
||||||
|
|
||||||
Args:
|
Args:
|
||||||
note (Field): _Note field_
|
note (Field): _Note field_
|
||||||
|
@ -15,7 +15,7 @@ from rest_framework_json_api.utils import get_related_resource_type
|
|||||||
|
|
||||||
from access.models.tenant import Tenant
|
from access.models.tenant import Tenant
|
||||||
|
|
||||||
from app.serializers.user import User, UserBaseSerializer
|
from centurion.serializers.user import User, UserBaseSerializer
|
||||||
|
|
||||||
from core import fields as centurion_field
|
from core import fields as centurion_field
|
||||||
from core.fields.badge import BadgeField
|
from core.fields.badge import BadgeField
|
||||||
|
@ -8,7 +8,7 @@ from access.models.tenant import Tenant as Organization
|
|||||||
|
|
||||||
from api.serializers.auth_token import AuthToken, AuthTokenModelSerializer
|
from api.serializers.auth_token import AuthToken, AuthTokenModelSerializer
|
||||||
|
|
||||||
from app.tests.abstract.mock_view import MockView, User
|
from centurion.tests.abstract.mock_view import MockView, User
|
||||||
|
|
||||||
# from core.serializers.manufacturer import Manufacturer, ManufacturerModelSerializer
|
# from core.serializers.manufacturer import Manufacturer, ManufacturerModelSerializer
|
||||||
|
|
||||||
|
@ -11,7 +11,7 @@ from rest_framework.relations import Hyperlink
|
|||||||
from access.models.team import Team
|
from access.models.team import Team
|
||||||
from access.models.team_user import TeamUsers
|
from access.models.team_user import TeamUsers
|
||||||
|
|
||||||
from app.tests.common import DoesNotExist
|
from centurion.tests.common import DoesNotExist
|
||||||
|
|
||||||
User = django.contrib.auth.get_user_model()
|
User = django.contrib.auth.get_user_model()
|
||||||
|
|
||||||
|
@ -10,7 +10,7 @@ from api.viewsets import (
|
|||||||
index as v2
|
index as v2
|
||||||
)
|
)
|
||||||
|
|
||||||
from app.viewsets.base import (
|
from centurion.viewsets.base import (
|
||||||
index as base_index_v2,
|
index as base_index_v2,
|
||||||
content_type as content_type_v2,
|
content_type as content_type_v2,
|
||||||
permisson as permission_v2,
|
permisson as permission_v2,
|
||||||
|
@ -1,79 +0,0 @@
|
|||||||
import logging
|
|
||||||
import os
|
|
||||||
|
|
||||||
from django.conf import settings
|
|
||||||
|
|
||||||
from celery import Celery, signals
|
|
||||||
from celery.fixups.django import DjangoFixup
|
|
||||||
|
|
||||||
from pathlib import Path
|
|
||||||
|
|
||||||
from prometheus_client import CollectorRegistry, multiprocess, start_http_server
|
|
||||||
|
|
||||||
logger = logging.getLogger(__name__)
|
|
||||||
|
|
||||||
os.environ.setdefault('DJANGO_SETTINGS_MODULE', 'app.settings')
|
|
||||||
|
|
||||||
worker = Celery('app')
|
|
||||||
|
|
||||||
worker.config_from_object(f'django.conf:settings', namespace='CELERY')
|
|
||||||
|
|
||||||
worker.autodiscover_tasks()
|
|
||||||
|
|
||||||
|
|
||||||
@worker.task(bind=True, ignore_result=True)
|
|
||||||
def debug_task(self):
|
|
||||||
print(f'Request: {self!r}')
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
@signals.worker_ready.connect()
|
|
||||||
def setup_prometheus(**kwargs):
|
|
||||||
|
|
||||||
if not getattr(settings, 'METRICS_ENABLED', False):
|
|
||||||
return
|
|
||||||
|
|
||||||
proc_path = None
|
|
||||||
|
|
||||||
try:
|
|
||||||
proc_path = os.environ["PROMETHEUS_MULTIPROC_DIR"]
|
|
||||||
except:
|
|
||||||
pass
|
|
||||||
|
|
||||||
|
|
||||||
if not proc_path:
|
|
||||||
|
|
||||||
os.environ["PROMETHEUS_MULTIPROC_DIR"] = settings.METRICS_MULTIPROC_DIR
|
|
||||||
|
|
||||||
proc_path = os.environ["PROMETHEUS_MULTIPROC_DIR"]
|
|
||||||
|
|
||||||
|
|
||||||
logger.info(f'Setting up prometheus metrics HTTP server on port {str(settings.METRICS_EXPORT_PORT)}.')
|
|
||||||
|
|
||||||
multiproc_folder_path = _setup_multiproc_folder()
|
|
||||||
|
|
||||||
registry = CollectorRegistry()
|
|
||||||
|
|
||||||
logger.info(f'Setting up prometheus metrics directory.')
|
|
||||||
|
|
||||||
multiprocess.MultiProcessCollector(registry, path=multiproc_folder_path)
|
|
||||||
|
|
||||||
logger.info(f'Starting prometheus metrics server.')
|
|
||||||
|
|
||||||
start_http_server( settings.METRICS_EXPORT_PORT, registry=registry)
|
|
||||||
|
|
||||||
logger.info(f'Starting prometheus serving on port {str(settings.METRICS_EXPORT_PORT)}.')
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
def _setup_multiproc_folder():
|
|
||||||
|
|
||||||
coordination_dir = Path(os.environ["PROMETHEUS_MULTIPROC_DIR"])
|
|
||||||
|
|
||||||
coordination_dir.mkdir(parents=True, exist_ok=True)
|
|
||||||
|
|
||||||
for filepath in coordination_dir.glob("*.db"):
|
|
||||||
|
|
||||||
filepath.unlink()
|
|
||||||
|
|
||||||
return coordination_dir
|
|
@ -3,7 +3,7 @@ from django import forms
|
|||||||
from django.urls import reverse
|
from django.urls import reverse
|
||||||
from django.forms import ValidationError
|
from django.forms import ValidationError
|
||||||
|
|
||||||
from app import settings
|
from django.conf import settings
|
||||||
|
|
||||||
from assistance.models.knowledge_base import KnowledgeBase
|
from assistance.models.knowledge_base import KnowledgeBase
|
||||||
|
|
||||||
|
@ -6,7 +6,7 @@ from rest_framework.exceptions import ValidationError
|
|||||||
from access.serializers.organization import TenantBaseSerializer
|
from access.serializers.organization import TenantBaseSerializer
|
||||||
from access.serializers.teams import TeamBaseSerializer
|
from access.serializers.teams import TeamBaseSerializer
|
||||||
|
|
||||||
from app.serializers.user import UserBaseSerializer
|
from centurion.serializers.user import UserBaseSerializer
|
||||||
|
|
||||||
from api.serializers import common
|
from api.serializers import common
|
||||||
|
|
||||||
|
@ -7,7 +7,7 @@ from rest_framework.exceptions import ParseError, ValidationError
|
|||||||
from access.serializers.organization import TenantBaseSerializer
|
from access.serializers.organization import TenantBaseSerializer
|
||||||
from access.serializers.teams import TeamBaseSerializer
|
from access.serializers.teams import TeamBaseSerializer
|
||||||
|
|
||||||
from app.serializers.user import UserBaseSerializer
|
from centurion.serializers.user import UserBaseSerializer
|
||||||
|
|
||||||
from api.serializers import common
|
from api.serializers import common
|
||||||
|
|
||||||
|
@ -2,7 +2,7 @@ from rest_framework import serializers
|
|||||||
|
|
||||||
from api.serializers import common
|
from api.serializers import common
|
||||||
|
|
||||||
from app.serializers.user import UserBaseSerializer
|
from centurion.serializers.user import UserBaseSerializer
|
||||||
|
|
||||||
from assistance.models.knowledge_base_category_notes import KnowledgeCategoryBaseNotes
|
from assistance.models.knowledge_base_category_notes import KnowledgeCategoryBaseNotes
|
||||||
|
|
||||||
|
@ -4,7 +4,7 @@ from assistance.models.knowledge_base_notes import KnowledgeBaseNotes
|
|||||||
|
|
||||||
from api.serializers import common
|
from api.serializers import common
|
||||||
|
|
||||||
from app.serializers.user import UserBaseSerializer
|
from centurion.serializers.user import UserBaseSerializer
|
||||||
|
|
||||||
from core.serializers.model_notes import (
|
from core.serializers.model_notes import (
|
||||||
ModelNotes,
|
ModelNotes,
|
||||||
|
@ -1,6 +1,6 @@
|
|||||||
from rest_framework import serializers
|
from rest_framework import serializers
|
||||||
|
|
||||||
from app.serializers.user import UserBaseSerializer
|
from centurion.serializers.user import UserBaseSerializer
|
||||||
|
|
||||||
from core.models.ticket.ticket_category import TicketCategory
|
from core.models.ticket.ticket_category import TicketCategory
|
||||||
from core.serializers.ticket_depreciated import (
|
from core.serializers.ticket_depreciated import (
|
||||||
|
@ -9,7 +9,7 @@ from rest_framework.exceptions import ValidationError
|
|||||||
from access.models.tenant import Tenant as Organization
|
from access.models.tenant import Tenant as Organization
|
||||||
from access.models.team import Team
|
from access.models.team import Team
|
||||||
|
|
||||||
from app.tests.abstract.mock_view import MockView
|
from centurion.tests.abstract.mock_view import MockView
|
||||||
|
|
||||||
from assistance.models.knowledge_base import KnowledgeBase
|
from assistance.models.knowledge_base import KnowledgeBase
|
||||||
from assistance.serializers.knowledge_base import KnowledgeBaseModelSerializer
|
from assistance.serializers.knowledge_base import KnowledgeBaseModelSerializer
|
||||||
|
@ -9,7 +9,7 @@ from rest_framework.exceptions import ValidationError
|
|||||||
from access.models.tenant import Tenant as Organization
|
from access.models.tenant import Tenant as Organization
|
||||||
from access.models.team import Team
|
from access.models.team import Team
|
||||||
|
|
||||||
from app.tests.abstract.mock_view import MockView
|
from centurion.tests.abstract.mock_view import MockView
|
||||||
|
|
||||||
from assistance.serializers.knowledge_base_category import KnowledgeBaseCategory, KnowledgeBaseCategoryModelSerializer
|
from assistance.serializers.knowledge_base_category import KnowledgeBaseCategory, KnowledgeBaseCategoryModelSerializer
|
||||||
|
|
||||||
|
@ -14,7 +14,7 @@ from access.models.tenant import Tenant as Organization
|
|||||||
from access.models.team import Team
|
from access.models.team import Team
|
||||||
from access.models.team_user import TeamUsers
|
from access.models.team_user import TeamUsers
|
||||||
|
|
||||||
from app.tests.abstract.model_permissions import ModelPermissions
|
from centurion.tests.abstract.model_permissions import ModelPermissions
|
||||||
|
|
||||||
from assistance.models.knowledge_base import KnowledgeBase
|
from assistance.models.knowledge_base import KnowledgeBase
|
||||||
|
|
||||||
|
@ -4,7 +4,7 @@ import requests
|
|||||||
|
|
||||||
from django.test import TestCase
|
from django.test import TestCase
|
||||||
|
|
||||||
from app.tests.abstract.models import PrimaryModel
|
from centurion.tests.abstract.models import PrimaryModel
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
@ -1,6 +1,6 @@
|
|||||||
from django.test import TestCase
|
from django.test import TestCase
|
||||||
|
|
||||||
from app.tests.unit.test_unit_models import (
|
from centurion.tests.unit.test_unit_models import (
|
||||||
TenancyObjectInheritedCases
|
TenancyObjectInheritedCases
|
||||||
)
|
)
|
||||||
|
|
||||||
|
@ -14,7 +14,7 @@ from access.models.tenant import Tenant as Organization
|
|||||||
from access.models.team import Team
|
from access.models.team import Team
|
||||||
from access.models.team_user import TeamUsers
|
from access.models.team_user import TeamUsers
|
||||||
|
|
||||||
from app.tests.abstract.model_permissions import ModelPermissions
|
from centurion.tests.abstract.model_permissions import ModelPermissions
|
||||||
|
|
||||||
from assistance.models.knowledge_base import KnowledgeBaseCategory
|
from assistance.models.knowledge_base import KnowledgeBaseCategory
|
||||||
|
|
||||||
|
@ -4,7 +4,7 @@ import requests
|
|||||||
|
|
||||||
from django.test import TestCase
|
from django.test import TestCase
|
||||||
|
|
||||||
from app.tests.abstract.models import PrimaryModel
|
from centurion.tests.abstract.models import PrimaryModel
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
@ -1,4 +1,4 @@
|
|||||||
from app.tests.unit.test_unit_models import (
|
from centurion.tests.unit.test_unit_models import (
|
||||||
TenancyObjectInheritedCases
|
TenancyObjectInheritedCases
|
||||||
)
|
)
|
||||||
|
|
||||||
|
@ -5,7 +5,7 @@ from rest_framework.exceptions import ValidationError
|
|||||||
|
|
||||||
from access.models.tenant import Tenant as Organization
|
from access.models.tenant import Tenant as Organization
|
||||||
|
|
||||||
from app.tests.unit.test_unit_models import (
|
from centurion.tests.unit.test_unit_models import (
|
||||||
TenancyObjectInheritedCases
|
TenancyObjectInheritedCases
|
||||||
)
|
)
|
||||||
|
|
||||||
|
@ -11,6 +11,6 @@ import os
|
|||||||
|
|
||||||
from django.core.asgi import get_asgi_application
|
from django.core.asgi import get_asgi_application
|
||||||
|
|
||||||
os.environ.setdefault('DJANGO_SETTINGS_MODULE', 'app.settings')
|
os.environ.setdefault('DJANGO_SETTINGS_MODULE', 'centurion.settings')
|
||||||
|
|
||||||
application = get_asgi_application()
|
application = get_asgi_application()
|
@ -1,6 +1,6 @@
|
|||||||
import re
|
import re
|
||||||
|
|
||||||
from app.urls import urlpatterns
|
from centurion.urls import urlpatterns
|
||||||
|
|
||||||
from django.conf import settings
|
from django.conf import settings
|
||||||
from django.urls import URLPattern, URLResolver
|
from django.urls import URLPattern, URLResolver
|
@ -3,7 +3,7 @@ from django.contrib.auth.models import Permission
|
|||||||
from rest_framework import serializers
|
from rest_framework import serializers
|
||||||
from rest_framework.reverse import reverse
|
from rest_framework.reverse import reverse
|
||||||
|
|
||||||
from app.serializers.content_type import ContentTypeBaseSerializer
|
from centurion.serializers.content_type import ContentTypeBaseSerializer
|
||||||
|
|
||||||
|
|
||||||
class PermissionBaseSerializer(serializers.ModelSerializer):
|
class PermissionBaseSerializer(serializers.ModelSerializer):
|
@ -253,12 +253,12 @@ MIDDLEWARE = [
|
|||||||
'django.contrib.messages.middleware.MessageMiddleware',
|
'django.contrib.messages.middleware.MessageMiddleware',
|
||||||
'django.middleware.clickjacking.XFrameOptionsMiddleware',
|
'django.middleware.clickjacking.XFrameOptionsMiddleware',
|
||||||
'core.middleware.get_request.RequestMiddleware',
|
'core.middleware.get_request.RequestMiddleware',
|
||||||
'app.middleware.timezone.TimezoneMiddleware',
|
'centurion.middleware.timezone.TimezoneMiddleware',
|
||||||
'centurion_feature_flag.middleware.feature_flag.FeatureFlagMiddleware',
|
'centurion_feature_flag.middleware.feature_flag.FeatureFlagMiddleware',
|
||||||
]
|
]
|
||||||
|
|
||||||
|
|
||||||
ROOT_URLCONF = 'app.urls'
|
ROOT_URLCONF = 'centurion.urls'
|
||||||
|
|
||||||
TEMPLATES = [
|
TEMPLATES = [
|
||||||
{
|
{
|
||||||
@ -273,13 +273,13 @@ TEMPLATES = [
|
|||||||
'django.contrib.messages.context_processors.messages',
|
'django.contrib.messages.context_processors.messages',
|
||||||
'social_django.context_processors.backends',
|
'social_django.context_processors.backends',
|
||||||
'social_django.context_processors.login_redirect',
|
'social_django.context_processors.login_redirect',
|
||||||
'app.context_processors.base.common',
|
'centurion.context_processors.base.common',
|
||||||
],
|
],
|
||||||
},
|
},
|
||||||
},
|
},
|
||||||
]
|
]
|
||||||
|
|
||||||
WSGI_APPLICATION = 'app.wsgi.application'
|
WSGI_APPLICATION = 'centurion.wsgi.application'
|
||||||
|
|
||||||
|
|
||||||
# Database
|
# Database
|
@ -1,4 +1,4 @@
|
|||||||
from app.tests.abstract.views import AddView, ChangeView, DeleteView, DisplayView, IndexView
|
from centurion.tests.abstract.views import AddView, ChangeView, DeleteView, DisplayView, IndexView
|
||||||
|
|
||||||
|
|
||||||
|
|
@ -2,7 +2,7 @@ from django.conf import settings as django_settings
|
|||||||
from django.shortcuts import reverse
|
from django.shortcuts import reverse
|
||||||
from django.test import TestCase, Client
|
from django.test import TestCase, Client
|
||||||
|
|
||||||
from app.helpers.merge_software import merge_software
|
from centurion.helpers.merge_software import merge_software
|
||||||
|
|
||||||
|
|
||||||
import pytest
|
import pytest
|
@ -1,4 +1,4 @@
|
|||||||
from app.urls import urlpatterns
|
from centurion.urls import urlpatterns
|
||||||
|
|
||||||
class Data:
|
class Data:
|
||||||
|
|
@ -5,7 +5,7 @@ import unittest
|
|||||||
|
|
||||||
from django.test import LiveServerTestCase
|
from django.test import LiveServerTestCase
|
||||||
|
|
||||||
from app.urls import urlpatterns
|
from centurion.urls import urlpatterns
|
||||||
|
|
||||||
from conftest import Data
|
from conftest import Data
|
||||||
|
|
@ -4,7 +4,7 @@ from django.conf import settings as django_settings
|
|||||||
from django.shortcuts import reverse
|
from django.shortcuts import reverse
|
||||||
from django.test import TestCase, Client
|
from django.test import TestCase, Client
|
||||||
|
|
||||||
from app import settings
|
from django.conf import settings
|
||||||
|
|
||||||
|
|
||||||
|
|
@ -8,7 +8,7 @@ Function views
|
|||||||
1. Add an import: from my_app import views
|
1. Add an import: from my_app import views
|
||||||
2. Add a URL to urlpatterns: path('', views.home, name='home')
|
2. Add a URL to urlpatterns: path('', views.home, name='home')
|
||||||
Class-based views
|
Class-based views
|
||||||
1. Add an import: from other_app.views import Home
|
1. Add an import: from other_centurion.views import Home
|
||||||
2. Add a URL to urlpatterns: path('', Home.as_view(), name='home')
|
2. Add a URL to urlpatterns: path('', Home.as_view(), name='home')
|
||||||
Including another URLconf
|
Including another URLconf
|
||||||
1. Import the include() function: from django.urls import include, path
|
1. Import the include() function: from django.urls import include, path
|
@ -2,7 +2,7 @@ from drf_spectacular.utils import extend_schema, extend_schema_view, OpenApiResp
|
|||||||
|
|
||||||
from api.viewsets.common import AuthUserReadOnlyModelViewSet
|
from api.viewsets.common import AuthUserReadOnlyModelViewSet
|
||||||
|
|
||||||
from app.serializers.content_type import (
|
from centurion.serializers.content_type import (
|
||||||
ContentType,
|
ContentType,
|
||||||
ContentTypeViewSerializer
|
ContentTypeViewSerializer
|
||||||
)
|
)
|
@ -2,7 +2,7 @@ from drf_spectacular.utils import extend_schema, extend_schema_view, OpenApiResp
|
|||||||
|
|
||||||
from api.viewsets.common import AuthUserReadOnlyModelViewSet
|
from api.viewsets.common import AuthUserReadOnlyModelViewSet
|
||||||
|
|
||||||
from app.serializers.permission import (
|
from centurion.serializers.permission import (
|
||||||
Permission,
|
Permission,
|
||||||
PermissionViewSerializer
|
PermissionViewSerializer
|
||||||
)
|
)
|
@ -2,7 +2,7 @@ from drf_spectacular.utils import extend_schema, extend_schema_view, OpenApiResp
|
|||||||
|
|
||||||
from api.viewsets.common import AuthUserReadOnlyModelViewSet
|
from api.viewsets.common import AuthUserReadOnlyModelViewSet
|
||||||
|
|
||||||
from app.serializers.user import (
|
from centurion.serializers.user import (
|
||||||
User,
|
User,
|
||||||
UserBaseSerializer
|
UserBaseSerializer
|
||||||
)
|
)
|
@ -11,6 +11,6 @@ import os
|
|||||||
|
|
||||||
from django.core.wsgi import get_wsgi_application
|
from django.core.wsgi import get_wsgi_application
|
||||||
|
|
||||||
os.environ.setdefault('DJANGO_SETTINGS_MODULE', 'app.settings')
|
os.environ.setdefault('DJANGO_SETTINGS_MODULE', 'centurion.settings')
|
||||||
|
|
||||||
application = get_wsgi_application()
|
application = get_wsgi_application()
|
@ -2,7 +2,7 @@ import subprocess
|
|||||||
|
|
||||||
from django.core.management.base import BaseCommand
|
from django.core.management.base import BaseCommand
|
||||||
|
|
||||||
from app import settings
|
from centurion import settings
|
||||||
|
|
||||||
from centurion_feature_flag.lib.feature_flag import CenturionFeatureFlagging
|
from centurion_feature_flag.lib.feature_flag import CenturionFeatureFlagging
|
||||||
|
|
||||||
|
@ -1,4 +1,4 @@
|
|||||||
from app import settings
|
from centurion import settings
|
||||||
from centurion_feature_flag.lib.feature_flag import CenturionFeatureFlagging
|
from centurion_feature_flag.lib.feature_flag import CenturionFeatureFlagging
|
||||||
|
|
||||||
|
|
||||||
|
@ -6,7 +6,7 @@ from django.urls.conf import (
|
|||||||
RoutePattern as DjangoRoutePattern,
|
RoutePattern as DjangoRoutePattern,
|
||||||
)
|
)
|
||||||
|
|
||||||
from app import settings
|
from centurion import settings
|
||||||
|
|
||||||
from centurion_feature_flag.lib.feature_flag import CenturionFeatureFlagging
|
from centurion_feature_flag.lib.feature_flag import CenturionFeatureFlagging
|
||||||
from centurion_feature_flag.views.disabled import FeatureFlagView
|
from centurion_feature_flag.views.disabled import FeatureFlagView
|
||||||
|
@ -5,7 +5,7 @@ from rest_framework.routers import (
|
|||||||
SimpleRouter as DRFSimpleRouter,
|
SimpleRouter as DRFSimpleRouter,
|
||||||
)
|
)
|
||||||
|
|
||||||
from app import settings
|
from centurion import settings
|
||||||
|
|
||||||
from centurion_feature_flag.lib.feature_flag import CenturionFeatureFlagging
|
from centurion_feature_flag.lib.feature_flag import CenturionFeatureFlagging
|
||||||
|
|
||||||
|
@ -1,7 +1,7 @@
|
|||||||
from django import forms
|
from django import forms
|
||||||
from django.urls import reverse
|
from django.urls import reverse
|
||||||
|
|
||||||
from app import settings
|
from django.conf import settings
|
||||||
|
|
||||||
from config_management.models.groups import ConfigGroups
|
from config_management.models.groups import ConfigGroups
|
||||||
|
|
||||||
|
@ -10,7 +10,7 @@ from rest_framework.reverse import reverse
|
|||||||
from access.fields import *
|
from access.fields import *
|
||||||
from access.models.tenancy import TenancyObject
|
from access.models.tenancy import TenancyObject
|
||||||
|
|
||||||
from app.helpers.merge_software import merge_software
|
from centurion.helpers.merge_software import merge_software
|
||||||
|
|
||||||
from core.lib.feature_not_used import FeatureNotUsed
|
from core.lib.feature_not_used import FeatureNotUsed
|
||||||
from core.mixin.history_save import SaveHistory
|
from core.mixin.history_save import SaveHistory
|
||||||
|
@ -2,7 +2,7 @@ from rest_framework import serializers
|
|||||||
|
|
||||||
from api.serializers import common
|
from api.serializers import common
|
||||||
|
|
||||||
from app.serializers.user import UserBaseSerializer
|
from centurion.serializers.user import UserBaseSerializer
|
||||||
|
|
||||||
from core.serializers.model_notes import (
|
from core.serializers.model_notes import (
|
||||||
ModelNotes,
|
ModelNotes,
|
||||||
|
@ -6,7 +6,7 @@ from rest_framework.exceptions import ValidationError
|
|||||||
|
|
||||||
from access.models.tenant import Tenant as Organization
|
from access.models.tenant import Tenant as Organization
|
||||||
|
|
||||||
from app.tests.abstract.mock_view import MockView, User
|
from centurion.tests.abstract.mock_view import MockView, User
|
||||||
|
|
||||||
from config_management.serializers.config_group import ConfigGroups, ConfigGroupModelSerializer
|
from config_management.serializers.config_group import ConfigGroups, ConfigGroupModelSerializer
|
||||||
|
|
||||||
|
@ -14,7 +14,7 @@ from access.models.tenant import Tenant as Organization
|
|||||||
from access.models.team import Team
|
from access.models.team import Team
|
||||||
from access.models.team_user import TeamUsers
|
from access.models.team_user import TeamUsers
|
||||||
|
|
||||||
from app.tests.abstract.model_permissions import ModelPermissions
|
from centurion.tests.abstract.model_permissions import ModelPermissions
|
||||||
|
|
||||||
from config_management.models.groups import ConfigGroups
|
from config_management.models.groups import ConfigGroups
|
||||||
|
|
||||||
|
@ -4,7 +4,7 @@ import requests
|
|||||||
|
|
||||||
from django.test import TestCase
|
from django.test import TestCase
|
||||||
|
|
||||||
from app.tests.abstract.models import PrimaryModel
|
from centurion.tests.abstract.models import PrimaryModel
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
@ -4,7 +4,7 @@ from django.test import TestCase
|
|||||||
|
|
||||||
from access.models.tenant import Tenant as Organization
|
from access.models.tenant import Tenant as Organization
|
||||||
|
|
||||||
from app.tests.unit.test_unit_models import (
|
from centurion.tests.unit.test_unit_models import (
|
||||||
TenancyObjectInheritedCases
|
TenancyObjectInheritedCases
|
||||||
)
|
)
|
||||||
|
|
||||||
|
@ -14,7 +14,7 @@ from access.models.tenant import Tenant as Organization
|
|||||||
from access.models.team import Team
|
from access.models.team import Team
|
||||||
from access.models.team_user import TeamUsers
|
from access.models.team_user import TeamUsers
|
||||||
|
|
||||||
from app.tests.abstract.model_permissions import ModelPermissionsAdd, ModelPermissionsChange, ModelPermissionsDelete
|
from centurion.tests.abstract.model_permissions import ModelPermissionsAdd, ModelPermissionsChange, ModelPermissionsDelete
|
||||||
|
|
||||||
from config_management.models.groups import ConfigGroups, ConfigGroupSoftware
|
from config_management.models.groups import ConfigGroups, ConfigGroupSoftware
|
||||||
|
|
||||||
|
@ -4,7 +4,7 @@ import requests
|
|||||||
|
|
||||||
from django.test import TestCase
|
from django.test import TestCase
|
||||||
|
|
||||||
from app.tests.abstract.models import AddView, ChangeView, DeleteView
|
from centurion.tests.abstract.models import AddView, ChangeView, DeleteView
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
@ -2,7 +2,7 @@ from django.test import TestCase
|
|||||||
|
|
||||||
from access.models.tenant import Tenant as Organization
|
from access.models.tenant import Tenant as Organization
|
||||||
|
|
||||||
from app.tests.unit.test_unit_models import (
|
from centurion.tests.unit.test_unit_models import (
|
||||||
TenancyObjectInheritedCases
|
TenancyObjectInheritedCases
|
||||||
)
|
)
|
||||||
|
|
||||||
|
@ -1,4 +1,4 @@
|
|||||||
from app import settings
|
from django.conf import settings
|
||||||
|
|
||||||
from core.forms.common import CommonModelForm
|
from core.forms.common import CommonModelForm
|
||||||
from core.models.notes import Notes
|
from core.models.notes import Notes
|
||||||
|
@ -1,7 +1,7 @@
|
|||||||
from django import forms
|
from django import forms
|
||||||
from django.urls import reverse
|
from django.urls import reverse
|
||||||
|
|
||||||
from app import settings
|
from django.conf import settings
|
||||||
|
|
||||||
from core.forms.common import CommonModelForm
|
from core.forms.common import CommonModelForm
|
||||||
from core.models.manufacturer import Manufacturer
|
from core.models.manufacturer import Manufacturer
|
||||||
|
@ -2,7 +2,7 @@ from django import forms
|
|||||||
from django.db.models import Q
|
from django.db.models import Q
|
||||||
from django.forms import ValidationError
|
from django.forms import ValidationError
|
||||||
|
|
||||||
from app import settings
|
from django.conf import settings
|
||||||
|
|
||||||
from core.forms.common import CommonModelForm
|
from core.forms.common import CommonModelForm
|
||||||
|
|
||||||
|
@ -2,7 +2,7 @@ from django import forms
|
|||||||
from django.db.models import Q
|
from django.db.models import Q
|
||||||
from django.forms import ValidationError
|
from django.forms import ValidationError
|
||||||
|
|
||||||
from app import settings
|
from django.conf import settings
|
||||||
|
|
||||||
from core.forms.common import CommonModelForm
|
from core.forms.common import CommonModelForm
|
||||||
from core.forms.validate_ticket import TicketValidation
|
from core.forms.validate_ticket import TicketValidation
|
||||||
|
@ -2,7 +2,7 @@ from django import forms
|
|||||||
from django.forms import ValidationError
|
from django.forms import ValidationError
|
||||||
from django.urls import reverse
|
from django.urls import reverse
|
||||||
|
|
||||||
from app import settings
|
from django.conf import settings
|
||||||
|
|
||||||
from core.forms.common import CommonModelForm
|
from core.forms.common import CommonModelForm
|
||||||
from core.models.ticket.ticket_category import TicketCategory
|
from core.models.ticket.ticket_category import TicketCategory
|
||||||
|
@ -1,7 +1,7 @@
|
|||||||
from django import forms
|
from django import forms
|
||||||
from django.db.models import Q
|
from django.db.models import Q
|
||||||
|
|
||||||
from app import settings
|
from django.conf import settings
|
||||||
|
|
||||||
from core.forms.common import CommonModelForm
|
from core.forms.common import CommonModelForm
|
||||||
from core.forms.validate_ticket_comment import TicketCommentValidation
|
from core.forms.validate_ticket_comment import TicketCommentValidation
|
||||||
|
@ -2,7 +2,7 @@ from django import forms
|
|||||||
from django.forms import ValidationError
|
from django.forms import ValidationError
|
||||||
from django.urls import reverse
|
from django.urls import reverse
|
||||||
|
|
||||||
from app import settings
|
from django.conf import settings
|
||||||
|
|
||||||
from core.forms.common import CommonModelForm
|
from core.forms.common import CommonModelForm
|
||||||
from core.models.ticket.ticket_comment_category import TicketCommentCategory
|
from core.models.ticket.ticket_comment_category import TicketCommentCategory
|
||||||
|
Some files were not shown because too many files have changed in this diff Show More
Reference in New Issue
Block a user