Switch to full app paths
Instead of inserting the path of the apps into the Python app, the apps are now referenced by their full import path. This solves name clashes with external or native Python libraries. Example: Mayan statistics app vs. Python new statistics library. Every app reference is now prepended with 'mayan.apps'. Existing config.yml files need to be updated manually. Signed-off-by: Roberto Rosario <roberto.rosario.gonzalez@gmail.com>
This commit is contained in:
@@ -1,3 +1,3 @@
|
||||
from __future__ import unicode_literals
|
||||
|
||||
default_app_config = 'document_indexing.apps.DocumentIndexingApp'
|
||||
default_app_config = 'mayan.apps.document_indexing.apps.DocumentIndexingApp'
|
||||
|
||||
@@ -4,12 +4,12 @@ from django.shortcuts import get_object_or_404
|
||||
|
||||
from rest_framework import generics
|
||||
|
||||
from acls.models import AccessControlList
|
||||
from documents.models import Document
|
||||
from documents.permissions import permission_document_view
|
||||
from documents.serializers import DocumentSerializer
|
||||
from rest_api.filters import MayanObjectPermissionsFilter
|
||||
from rest_api.permissions import MayanPermission
|
||||
from mayan.apps.acls.models import AccessControlList
|
||||
from mayan.apps.documents.models import Document
|
||||
from mayan.apps.documents.permissions import permission_document_view
|
||||
from mayan.apps.documents.serializers import DocumentSerializer
|
||||
from mayan.apps.rest_api.filters import MayanObjectPermissionsFilter
|
||||
from mayan.apps.rest_api.permissions import MayanPermission
|
||||
|
||||
from .models import Index, IndexInstanceNode, IndexTemplateNode
|
||||
from .permissions import (
|
||||
|
||||
@@ -6,18 +6,17 @@ from django.apps import apps
|
||||
from django.db.models.signals import post_delete, post_save, pre_delete
|
||||
from django.utils.translation import ugettext_lazy as _
|
||||
|
||||
from acls import ModelPermission
|
||||
from acls.links import link_acl_list
|
||||
from acls.permissions import permission_acl_edit, permission_acl_view
|
||||
|
||||
from common import (
|
||||
from mayan.apps.acls import ModelPermission
|
||||
from mayan.apps.acls.links import link_acl_list
|
||||
from mayan.apps.acls.permissions import permission_acl_edit, permission_acl_view
|
||||
from mayan.apps.common import (
|
||||
MayanAppConfig, menu_facet, menu_main, menu_object, menu_secondary,
|
||||
menu_setup, menu_tools
|
||||
)
|
||||
from common.widgets import TwoStateWidget
|
||||
from documents.signals import post_document_created, post_initial_document_type
|
||||
from mayan.apps.common.widgets import TwoStateWidget
|
||||
from mayan.apps.documents.signals import post_document_created, post_initial_document_type
|
||||
from mayan.apps.navigation import SourceColumn
|
||||
from mayan.celery import app
|
||||
from navigation import SourceColumn
|
||||
|
||||
from .handlers import (
|
||||
create_default_document_index, handler_delete_empty,
|
||||
@@ -48,7 +47,7 @@ class DocumentIndexingApp(MayanAppConfig):
|
||||
app_url = 'indexing'
|
||||
has_rest_api = True
|
||||
has_tests = True
|
||||
name = 'document_indexing'
|
||||
name = 'mayan.apps.document_indexing'
|
||||
verbose_name = _('Document indexing')
|
||||
|
||||
def ready(self):
|
||||
@@ -164,16 +163,16 @@ class DocumentIndexingApp(MayanAppConfig):
|
||||
|
||||
app.conf.CELERY_ROUTES.update(
|
||||
{
|
||||
'document_indexing.tasks.task_delete_empty': {
|
||||
'mayan.apps.document_indexing.tasks.task_delete_empty': {
|
||||
'queue': 'indexing'
|
||||
},
|
||||
'document_indexing.tasks.task_remove_document': {
|
||||
'mayan.apps.document_indexing.tasks.task_remove_document': {
|
||||
'queue': 'indexing'
|
||||
},
|
||||
'document_indexing.tasks.task_index_document': {
|
||||
'mayan.apps.document_indexing.tasks.task_index_document': {
|
||||
'queue': 'indexing'
|
||||
},
|
||||
'document_indexing.tasks.task_rebuild_index': {
|
||||
'mayan.apps.document_indexing.tasks.task_rebuild_index': {
|
||||
'queue': 'tools'
|
||||
},
|
||||
}
|
||||
|
||||
@@ -4,9 +4,9 @@ from django import forms
|
||||
from django.utils.encoding import force_text
|
||||
from django.utils.translation import ugettext_lazy as _
|
||||
|
||||
from acls.models import AccessControlList
|
||||
from common.classes import ModelProperty
|
||||
from documents.models import Document
|
||||
from mayan.apps.acls.models import AccessControlList
|
||||
from mayan.apps.common.classes import ModelProperty
|
||||
from mayan.apps.documents.models import Document
|
||||
|
||||
from .models import Index, IndexTemplateNode
|
||||
from .permissions import permission_document_indexing_rebuild
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
from __future__ import absolute_import, unicode_literals
|
||||
|
||||
from appearance.classes import Icon
|
||||
from mayan.apps.appearance.classes import Icon
|
||||
|
||||
icon_document_index_list = Icon(driver_name='fontawesome', symbol='list-ul')
|
||||
icon_index_level_up = Icon(
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
from __future__ import absolute_import, unicode_literals
|
||||
|
||||
from common.classes import Package
|
||||
from mayan.apps.common.classes import Package
|
||||
|
||||
Package(label='Django MPTT', license_text='''
|
||||
Django MPTT
|
||||
|
||||
@@ -2,7 +2,7 @@ from __future__ import unicode_literals
|
||||
|
||||
from django.utils.translation import ugettext_lazy as _
|
||||
|
||||
from navigation import Link, get_cascade_condition
|
||||
from mayan.apps.navigation import Link, get_cascade_condition
|
||||
|
||||
from .icons import (
|
||||
icon_document_index_list, icon_index, icon_index_create,
|
||||
|
||||
@@ -11,11 +11,11 @@ from django.utils.translation import ugettext, ugettext_lazy as _
|
||||
from mptt.fields import TreeForeignKey
|
||||
from mptt.models import MPTTModel
|
||||
|
||||
from acls.models import AccessControlList
|
||||
from documents.models import Document, DocumentType
|
||||
from documents.permissions import permission_document_view
|
||||
from lock_manager import LockError
|
||||
from lock_manager.runtime import locking_backend
|
||||
from mayan.apps.acls.models import AccessControlList
|
||||
from mayan.apps.documents.models import Document, DocumentType
|
||||
from mayan.apps.documents.permissions import permission_document_view
|
||||
from mayan.apps.lock_manager import LockError
|
||||
from mayan.apps.lock_manager.runtime import locking_backend
|
||||
|
||||
from .managers import (
|
||||
DocumentIndexInstanceNodeManager, IndexManager, IndexInstanceNodeManager
|
||||
|
||||
@@ -2,7 +2,7 @@ from __future__ import absolute_import, unicode_literals
|
||||
|
||||
from django.utils.translation import ugettext_lazy as _
|
||||
|
||||
from permissions import PermissionNamespace
|
||||
from mayan.apps.permissions import PermissionNamespace
|
||||
|
||||
namespace = PermissionNamespace('document_indexing', _('Indexing'))
|
||||
|
||||
|
||||
@@ -2,24 +2,24 @@ from __future__ import absolute_import, unicode_literals
|
||||
|
||||
from django.utils.translation import ugettext_lazy as _
|
||||
|
||||
from common.queues import queue_tools
|
||||
from task_manager.classes import CeleryQueue
|
||||
from mayan.apps.common.queues import queue_tools
|
||||
from mayan.apps.task_manager.classes import CeleryQueue
|
||||
|
||||
queue_indexing = CeleryQueue(name='indexing', label=_('Indexing'))
|
||||
|
||||
queue_indexing.add_task_type(
|
||||
name='document_indexing.tasks.task_delete_empty',
|
||||
name='mayan.apps.document_indexing.tasks.task_delete_empty',
|
||||
label=_('Delete empty index nodes')
|
||||
)
|
||||
queue_indexing.add_task_type(
|
||||
name='document_indexing.tasks.task_remove_document',
|
||||
name='mayan.apps.document_indexing.tasks.task_remove_document',
|
||||
label=_('Remove document')
|
||||
)
|
||||
queue_indexing.add_task_type(
|
||||
name='document_indexing.tasks.task_index_document',
|
||||
name='mayan.apps.document_indexing.tasks.task_index_document',
|
||||
label=_('Index document')
|
||||
)
|
||||
queue_tools.add_task_type(
|
||||
name='document_indexing.tasks.task_rebuild_index',
|
||||
name='mayan.apps.document_indexing.tasks.task_rebuild_index',
|
||||
label=_('Rebuild index')
|
||||
)
|
||||
|
||||
@@ -5,8 +5,8 @@ import logging
|
||||
from django.apps import apps
|
||||
from django.db import OperationalError
|
||||
|
||||
from mayan.apps.lock_manager import LockError
|
||||
from mayan.celery import app
|
||||
from lock_manager import LockError
|
||||
|
||||
from .literals import RETRY_DELAY
|
||||
|
||||
|
||||
@@ -2,8 +2,8 @@ from __future__ import unicode_literals
|
||||
|
||||
from rest_framework import status
|
||||
|
||||
from documents.tests import DocumentTestMixin
|
||||
from rest_api.tests import BaseAPITestCase
|
||||
from mayan.apps.documents.tests import DocumentTestMixin
|
||||
from mayan.apps.rest_api.tests import BaseAPITestCase
|
||||
|
||||
from ..models import Index
|
||||
from ..permissions import (
|
||||
|
||||
@@ -3,13 +3,15 @@ from __future__ import unicode_literals
|
||||
from django.test import override_settings
|
||||
from django.utils.encoding import force_text
|
||||
|
||||
from common.tests import BaseTestCase
|
||||
from documents.tests import DocumentTestMixin, TEST_SMALL_DOCUMENT_PATH
|
||||
from documents.tests.literals import (
|
||||
from mayan.apps.common.tests import BaseTestCase
|
||||
from mayan.apps.documents.tests import (
|
||||
DocumentTestMixin, TEST_SMALL_DOCUMENT_PATH
|
||||
)
|
||||
from mayan.apps.documents.tests.literals import (
|
||||
TEST_DOCUMENT_DESCRIPTION, TEST_DOCUMENT_DESCRIPTION_EDITED,
|
||||
TEST_DOCUMENT_LABEL_EDITED
|
||||
)
|
||||
from metadata.models import MetadataType, DocumentTypeMetadataType
|
||||
from mayan.apps.metadata.models import MetadataType, DocumentTypeMetadataType
|
||||
|
||||
from ..models import Index, IndexInstanceNode, IndexTemplateNode
|
||||
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
from __future__ import absolute_import, unicode_literals
|
||||
|
||||
from documents.tests import GenericDocumentViewTestCase
|
||||
from mayan.apps.documents.tests import GenericDocumentViewTestCase
|
||||
|
||||
from ..models import Index
|
||||
from ..permissions import (
|
||||
|
||||
@@ -7,14 +7,14 @@ from django.urls import reverse, reverse_lazy
|
||||
from django.utils.html import mark_safe
|
||||
from django.utils.translation import ugettext_lazy as _, ungettext
|
||||
|
||||
from acls.models import AccessControlList
|
||||
from common.views import (
|
||||
from mayan.apps.acls.models import AccessControlList
|
||||
from mayan.apps.common.views import (
|
||||
AssignRemoveView, FormView, SingleObjectCreateView,
|
||||
SingleObjectDeleteView, SingleObjectEditView, SingleObjectListView
|
||||
)
|
||||
from documents.models import Document, DocumentType
|
||||
from documents.permissions import permission_document_view
|
||||
from documents.views import DocumentListView
|
||||
from mayan.apps.documents.models import Document, DocumentType
|
||||
from mayan.apps.documents.permissions import permission_document_view
|
||||
from mayan.apps.documents.views import DocumentListView
|
||||
|
||||
from .forms import IndexListForm, IndexTemplateNodeForm
|
||||
from .icons import icon_index
|
||||
|
||||
@@ -1,4 +1,3 @@
|
||||
# -*- coding: utf-8 -*-
|
||||
from __future__ import unicode_literals
|
||||
|
||||
from django.apps import apps
|
||||
|
||||
Reference in New Issue
Block a user