diff --git a/mayan/apps/acls/__init__.py b/mayan/apps/acls/__init__.py
index 67159f8380..f338aec7f5 100644
--- a/mayan/apps/acls/__init__.py
+++ b/mayan/apps/acls/__init__.py
@@ -2,4 +2,4 @@ from __future__ import unicode_literals
from .classes import ModelPermission # NOQA
-default_app_config = 'acls.apps.ACLsApp'
+default_app_config = 'mayan.apps.acls.apps.ACLsApp'
diff --git a/mayan/apps/acls/apps.py b/mayan/apps/acls/apps.py
index 9d31ac3e77..73ac37d443 100644
--- a/mayan/apps/acls/apps.py
+++ b/mayan/apps/acls/apps.py
@@ -2,16 +2,18 @@ from __future__ import unicode_literals
from django.utils.translation import ugettext_lazy as _
-from common import MayanAppConfig, menu_object, menu_sidebar
-from navigation import SourceColumn
+from mayan.apps.common import MayanAppConfig, menu_object, menu_sidebar
+from mayan.apps.navigation import SourceColumn
from .links import link_acl_create, link_acl_delete, link_acl_permissions
class ACLsApp(MayanAppConfig):
+ app_namespace = 'acls'
+ app_url = 'acls'
has_rest_api = True
has_tests = True
- name = 'acls'
+ name = 'mayan.apps.acls'
verbose_name = _('ACLs')
def ready(self):
diff --git a/mayan/apps/acls/icons.py b/mayan/apps/acls/icons.py
index 61b294faf3..1a1c73ef30 100644
--- a/mayan/apps/acls/icons.py
+++ b/mayan/apps/acls/icons.py
@@ -1,6 +1,6 @@
from __future__ import absolute_import, unicode_literals
-from appearance.classes import Icon
+from mayan.apps.appearance.classes import Icon
icon_acl_list = Icon(driver_name='fontawesome', symbol='lock')
icon_acl_new = Icon(driver_name='fontawesome', symbol='plus')
diff --git a/mayan/apps/acls/links.py b/mayan/apps/acls/links.py
index b1b2d07c13..8a12258448 100644
--- a/mayan/apps/acls/links.py
+++ b/mayan/apps/acls/links.py
@@ -3,7 +3,7 @@ from __future__ import unicode_literals
from django.apps import apps
from django.utils.translation import ugettext_lazy as _
-from navigation import Link
+from mayan.apps.navigation import Link
from .icons import icon_acl_list, icon_acl_new
from .permissions import permission_acl_view, permission_acl_edit
diff --git a/mayan/apps/acls/managers.py b/mayan/apps/acls/managers.py
index f625f40836..33eaf40b75 100644
--- a/mayan/apps/acls/managers.py
+++ b/mayan/apps/acls/managers.py
@@ -9,9 +9,9 @@ from django.db.models import Q
from django.utils.encoding import force_text
from django.utils.translation import ugettext
-from common.utils import return_attrib, return_related
-from permissions import Permission
-from permissions.models import StoredPermission
+from mayan.apps.common.utils import return_attrib, return_related
+from mayan.apps.permissions import Permission
+from mayan.apps.permissions.models import StoredPermission
from .exceptions import PermissionNotValidForClass
from .classes import ModelPermission
diff --git a/mayan/apps/acls/models.py b/mayan/apps/acls/models.py
index 171938c8be..c99648626b 100644
--- a/mayan/apps/acls/models.py
+++ b/mayan/apps/acls/models.py
@@ -8,7 +8,7 @@ from django.db import models
from django.utils.encoding import force_text, python_2_unicode_compatible
from django.utils.translation import ugettext_lazy as _
-from permissions.models import Role, StoredPermission
+from mayan.apps.permissions.models import Role, StoredPermission
from .managers import AccessControlListManager
diff --git a/mayan/apps/acls/permissions.py b/mayan/apps/acls/permissions.py
index da7a5ddce9..b2e7e789a1 100644
--- a/mayan/apps/acls/permissions.py
+++ b/mayan/apps/acls/permissions.py
@@ -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('acls', _('Access control lists'))
diff --git a/mayan/apps/acls/serializers.py b/mayan/apps/acls/serializers.py
index d312f8d827..1ad961242f 100644
--- a/mayan/apps/acls/serializers.py
+++ b/mayan/apps/acls/serializers.py
@@ -9,10 +9,10 @@ from rest_framework import serializers
from rest_framework.exceptions import ValidationError
from rest_framework.reverse import reverse
-from common.serializers import ContentTypeSerializer
-from permissions import Permission
-from permissions.models import Role, StoredPermission
-from permissions.serializers import PermissionSerializer, RoleSerializer
+from mayan.apps.common.serializers import ContentTypeSerializer
+from mayan.apps.permissions import Permission
+from mayan.apps.permissions.models import Role, StoredPermission
+from mayan.apps.permissions.serializers import PermissionSerializer, RoleSerializer
from .models import AccessControlList
diff --git a/mayan/apps/acls/tests/mixins.py b/mayan/apps/acls/tests/mixins.py
index 8eac0d80d6..ff8b2193e7 100644
--- a/mayan/apps/acls/tests/mixins.py
+++ b/mayan/apps/acls/tests/mixins.py
@@ -3,11 +3,11 @@ from __future__ import unicode_literals
from django.contrib.auth import get_user_model
from django.contrib.auth.models import Group
-from acls.models import AccessControlList
-from permissions.models import Role
-from permissions.tests.literals import TEST_ROLE_LABEL
-from permissions.tests.mixins import RoleTestCaseMixin
-from user_management.tests.literals import (
+from mayan.apps.acls.models import AccessControlList
+from mayan.apps.permissions.models import Role
+from mayan.apps.permissions.tests.literals import TEST_ROLE_LABEL
+from mayan.apps.permissions.tests.mixins import RoleTestCaseMixin
+from mayan.apps.user_management.tests.literals import (
TEST_ADMIN_PASSWORD, TEST_ADMIN_USERNAME, TEST_ADMIN_EMAIL,
TEST_GROUP_NAME, TEST_USER_EMAIL, TEST_USER_USERNAME, TEST_USER_PASSWORD
)
diff --git a/mayan/apps/acls/tests/test_actions.py b/mayan/apps/acls/tests/test_actions.py
index c99d9f85b1..f638fef451 100644
--- a/mayan/apps/acls/tests/test_actions.py
+++ b/mayan/apps/acls/tests/test_actions.py
@@ -2,8 +2,8 @@ from __future__ import unicode_literals
from django.contrib.contenttypes.models import ContentType
-from document_states.tests.test_actions import ActionTestCase
-from documents.permissions import permission_document_view
+from mayan.apps.document_states.tests.test_actions import ActionTestCase
+from mayan.apps.documents.permissions import permission_document_view
from ..workflow_actions import GrantAccessAction, RevokeAccessAction
diff --git a/mayan/apps/acls/tests/test_api.py b/mayan/apps/acls/tests/test_api.py
index 9e086277dd..49e8cd53d2 100644
--- a/mayan/apps/acls/tests/test_api.py
+++ b/mayan/apps/acls/tests/test_api.py
@@ -5,10 +5,10 @@ from django.test import override_settings
from rest_framework import status
-from documents.permissions import permission_document_view
-from documents.tests import DocumentTestMixin
-from permissions.tests.literals import TEST_ROLE_LABEL
-from rest_api.tests import BaseAPITestCase
+from mayan.apps.documents.permissions import permission_document_view
+from mayan.apps.documents.tests import DocumentTestMixin
+from mayan.apps.permissions.tests.literals import TEST_ROLE_LABEL
+from mayan.apps.rest_api.tests import BaseAPITestCase
from ..models import AccessControlList
from ..permissions import permission_acl_view
diff --git a/mayan/apps/acls/tests/test_links.py b/mayan/apps/acls/tests/test_links.py
index 0ccc5ca63c..ec8a9e2ea7 100644
--- a/mayan/apps/acls/tests/test_links.py
+++ b/mayan/apps/acls/tests/test_links.py
@@ -3,7 +3,7 @@ from __future__ import unicode_literals
from django.contrib.contenttypes.models import ContentType
from django.urls import reverse
-from documents.tests import GenericDocumentViewTestCase
+from mayan.apps.documents.tests import GenericDocumentViewTestCase
from ..links import (
link_acl_delete, link_acl_list, link_acl_create, link_acl_permissions
diff --git a/mayan/apps/acls/tests/test_models.py b/mayan/apps/acls/tests/test_models.py
index 691d35553b..1f5e0beaf2 100644
--- a/mayan/apps/acls/tests/test_models.py
+++ b/mayan/apps/acls/tests/test_models.py
@@ -3,10 +3,10 @@ from __future__ import absolute_import, unicode_literals
from django.core.exceptions import PermissionDenied
from django.test import override_settings
-from common.tests import BaseTestCase
-from documents.models import Document, DocumentType
-from documents.permissions import permission_document_view
-from documents.tests import (
+from mayan.apps.common.tests import BaseTestCase
+from mayan.apps.documents.models import Document, DocumentType
+from mayan.apps.documents.permissions import permission_document_view
+from mayan.apps.documents.tests import (
TEST_SMALL_DOCUMENT_PATH, TEST_DOCUMENT_TYPE_LABEL,
TEST_DOCUMENT_TYPE_2_LABEL
)
diff --git a/mayan/apps/acls/tests/test_views.py b/mayan/apps/acls/tests/test_views.py
index 3784792fe0..38f98f0d5d 100644
--- a/mayan/apps/acls/tests/test_views.py
+++ b/mayan/apps/acls/tests/test_views.py
@@ -2,7 +2,7 @@ from __future__ import absolute_import, unicode_literals
from django.contrib.contenttypes.models import ContentType
-from documents.tests import GenericDocumentViewTestCase
+from mayan.apps.documents.tests import GenericDocumentViewTestCase
from ..models import AccessControlList
from ..permissions import permission_acl_edit, permission_acl_view
diff --git a/mayan/apps/acls/views.py b/mayan/apps/acls/views.py
index efd3becad7..79d1b496fb 100644
--- a/mayan/apps/acls/views.py
+++ b/mayan/apps/acls/views.py
@@ -11,12 +11,12 @@ from django.urls import reverse
from django.utils.encoding import force_text
from django.utils.translation import ugettext_lazy as _
-from common.views import (
+from mayan.apps.common.views import (
AssignRemoveView, SingleObjectCreateView, SingleObjectDeleteView,
SingleObjectListView
)
-from permissions import PermissionNamespace, Permission
-from permissions.models import StoredPermission
+from mayan.apps.permissions import PermissionNamespace, Permission
+from mayan.apps.permissions.models import StoredPermission
from .classes import ModelPermission
from .icons import icon_acl_list
diff --git a/mayan/apps/acls/workflow_actions.py b/mayan/apps/acls/workflow_actions.py
index 60cc5838f0..1843f73745 100644
--- a/mayan/apps/acls/workflow_actions.py
+++ b/mayan/apps/acls/workflow_actions.py
@@ -7,10 +7,10 @@ from django.contrib.contenttypes.models import ContentType
from django.core.exceptions import ValidationError
from django.utils.translation import ugettext_lazy as _
-from acls.models import AccessControlList
-from document_states.classes import WorkflowAction
-from permissions.classes import Permission
-from permissions.models import Role
+from mayan.apps.acls.models import AccessControlList
+from mayan.apps.document_states.classes import WorkflowAction
+from mayan.apps.permissions.classes import Permission
+from mayan.apps.permissions.models import Role
from .classes import ModelPermission
from .permissions import permission_acl_edit
diff --git a/mayan/apps/appearance/__init__.py b/mayan/apps/appearance/__init__.py
index 627f641acf..ddf88f7515 100644
--- a/mayan/apps/appearance/__init__.py
+++ b/mayan/apps/appearance/__init__.py
@@ -1,3 +1,3 @@
from __future__ import unicode_literals
-default_app_config = 'appearance.apps.AppearanceApp'
+default_app_config = 'mayan.apps.appearance.apps.AppearanceApp'
diff --git a/mayan/apps/appearance/apps.py b/mayan/apps/appearance/apps.py
index b8781b2023..f32a9a88b2 100644
--- a/mayan/apps/appearance/apps.py
+++ b/mayan/apps/appearance/apps.py
@@ -2,13 +2,13 @@ from __future__ import unicode_literals
from django.utils.translation import ugettext_lazy as _
-from common import MayanAppConfig
+from mayan.apps.common import MayanAppConfig
from .licenses import * # NOQA
class AppearanceApp(MayanAppConfig):
- name = 'appearance'
+ name = 'mayan.apps.appearance'
verbose_name = _('Appearance')
def ready(self):
diff --git a/mayan/apps/appearance/licenses.py b/mayan/apps/appearance/licenses.py
index 0f4180e2d0..db12e997c9 100644
--- a/mayan/apps/appearance/licenses.py
+++ b/mayan/apps/appearance/licenses.py
@@ -1,6 +1,6 @@
from __future__ import unicode_literals
-from common.classes import Package
+from mayan.apps.common.classes import Package
Package(label='Bootstrap', license_text='''
The MIT License (MIT)
diff --git a/mayan/apps/appearance/settings.py b/mayan/apps/appearance/settings.py
index ebcc2619ac..5a53ef6719 100644
--- a/mayan/apps/appearance/settings.py
+++ b/mayan/apps/appearance/settings.py
@@ -2,7 +2,7 @@ from __future__ import unicode_literals
from django.utils.translation import ugettext_lazy as _
-from smart_settings import Namespace
+from mayan.apps.smart_settings import Namespace
from .literals import DEFAULT_MAXIMUM_TITLE_LENGTH
diff --git a/mayan/apps/appearance/templates/appearance/about.html b/mayan/apps/appearance/templates/appearance/about.html
index 3a553b3e70..2bb43b1117 100644
--- a/mayan/apps/appearance/templates/appearance/about.html
+++ b/mayan/apps/appearance/templates/appearance/about.html
@@ -60,14 +60,14 @@
{% smart_setting 'COMMON_PROJECT_TITLE' as setting_project_title %}
{% project_information '__title__' as project_title %}
- {% get_icon 'common.icons.icon_documentation' as icon_documentation %}
- {% get_icon 'common.icons.icon_forum' as icon_forum %}
- {% get_icon 'common.icons.icon_social_facebook' as icon_social_facebook %}
- {% get_icon 'common.icons.icon_social_paypal' as icon_social_paypal %}
- {% get_icon 'common.icons.icon_social_twitter' as icon_social_twitter %}
- {% get_icon 'common.icons.icon_social_instagram' as icon_social_instagram %}
- {% get_icon 'common.icons.icon_source_code' as icon_source_code %}
- {% get_icon 'common.icons.icon_wiki' as icon_wiki %}
+ {% get_icon 'mayan.apps.common.icons.icon_documentation' as icon_documentation %}
+ {% get_icon 'mayan.apps.common.icons.icon_forum' as icon_forum %}
+ {% get_icon 'mayan.apps.common.icons.icon_social_facebook' as icon_social_facebook %}
+ {% get_icon 'mayan.apps.common.icons.icon_social_paypal' as icon_social_paypal %}
+ {% get_icon 'mayan.apps.common.icons.icon_social_twitter' as icon_social_twitter %}
+ {% get_icon 'mayan.apps.common.icons.icon_social_instagram' as icon_social_instagram %}
+ {% get_icon 'mayan.apps.common.icons.icon_source_code' as icon_source_code %}
+ {% get_icon 'mayan.apps.common.icons.icon_wiki' as icon_wiki %}
{{ setting_project_title }}
diff --git a/mayan/apps/appearance/templates/navigation/generic_subnavigation.html b/mayan/apps/appearance/templates/navigation/generic_subnavigation.html
index 2b0d8abab2..4ae4f99185 100644
--- a/mayan/apps/appearance/templates/navigation/generic_subnavigation.html
+++ b/mayan/apps/appearance/templates/navigation/generic_subnavigation.html
@@ -1,7 +1,7 @@
{% load common_tags %}
{% load navigation_tags %}
-{% if link|get_type == "
" %}
+{% if link|get_type == "" %}
{% if link.icon %}
diff --git a/mayan/apps/authentication/__init__.py b/mayan/apps/authentication/__init__.py
index 0a48c0ec4e..0713eaa422 100644
--- a/mayan/apps/authentication/__init__.py
+++ b/mayan/apps/authentication/__init__.py
@@ -1,3 +1,3 @@
from __future__ import unicode_literals
-default_app_config = 'authentication.apps.AuthenticationApp'
+default_app_config = 'mayan.apps.authentication.apps.AuthenticationApp'
diff --git a/mayan/apps/authentication/apps.py b/mayan/apps/authentication/apps.py
index 2c954c5530..d5e570037e 100644
--- a/mayan/apps/authentication/apps.py
+++ b/mayan/apps/authentication/apps.py
@@ -4,8 +4,8 @@ import logging
from django.utils.translation import ugettext_lazy as _
-from common import MayanAppConfig, menu_user
-from navigation.classes import Separator
+from mayan.apps.common import MayanAppConfig, menu_user
+from mayan.apps.navigation.classes import Separator
from .links import link_logout, link_password_change
@@ -13,8 +13,10 @@ logger = logging.getLogger(__name__)
class AuthenticationApp(MayanAppConfig):
+ app_namespace = 'authentication'
+ app_url = 'authentication'
has_tests = True
- name = 'authentication'
+ name = 'mayan.apps.authentication'
verbose_name = _('Authentication')
def ready(self):
diff --git a/mayan/apps/authentication/forms.py b/mayan/apps/authentication/forms.py
index e39f7471dc..ebc7e5233d 100644
--- a/mayan/apps/authentication/forms.py
+++ b/mayan/apps/authentication/forms.py
@@ -7,7 +7,7 @@ from django.contrib.auth import authenticate
from django.contrib.auth.forms import AuthenticationForm
from django.utils.translation import ugettext_lazy as _
-from common.widgets import EmailInput
+from mayan.apps.common.widgets import EmailInput
class EmailAuthenticationForm(forms.Form):
diff --git a/mayan/apps/authentication/icons.py b/mayan/apps/authentication/icons.py
index 10b52482cb..9936baf368 100644
--- a/mayan/apps/authentication/icons.py
+++ b/mayan/apps/authentication/icons.py
@@ -1,6 +1,6 @@
from __future__ import absolute_import, unicode_literals
-from appearance.classes import Icon
+from mayan.apps.appearance.classes import Icon
icon_logout = Icon(driver_name='fontawesome', symbol='sign-out-alt')
icon_password_change = Icon(driver_name='fontawesome', symbol='key')
diff --git a/mayan/apps/authentication/links.py b/mayan/apps/authentication/links.py
index 45c67515c2..2f145e7ddc 100644
--- a/mayan/apps/authentication/links.py
+++ b/mayan/apps/authentication/links.py
@@ -2,7 +2,7 @@ from __future__ import unicode_literals
from django.utils.translation import ugettext_lazy as _
-from navigation import Link
+from mayan.apps.navigation import Link
from .icons import icon_logout, icon_password_change
diff --git a/mayan/apps/authentication/settings.py b/mayan/apps/authentication/settings.py
index 8482a6ff43..f0b7c0f409 100644
--- a/mayan/apps/authentication/settings.py
+++ b/mayan/apps/authentication/settings.py
@@ -2,7 +2,7 @@ from __future__ import unicode_literals
from django.utils.translation import ugettext_lazy as _
-from smart_settings import Namespace
+from mayan.apps.smart_settings import Namespace
from .literals import DEFAULT_LOGIN_METHOD, DEFAULT_MAXIMUM_SESSION_LENGTH
diff --git a/mayan/apps/authentication/tests/literals.py b/mayan/apps/authentication/tests/literals.py
index 214cd1ff6c..daa6b65dd6 100644
--- a/mayan/apps/authentication/tests/literals.py
+++ b/mayan/apps/authentication/tests/literals.py
@@ -1,3 +1,3 @@
from __future__ import unicode_literals
-TEST_EMAIL_AUTHENTICATION_BACKEND = 'authentication.auth.email_auth_backend.EmailAuthBackend'
+TEST_EMAIL_AUTHENTICATION_BACKEND = 'mayan.apps.authentication.auth.email_auth_backend.EmailAuthBackend'
diff --git a/mayan/apps/authentication/tests/test_views.py b/mayan/apps/authentication/tests/test_views.py
index 834c55abb2..2e152e1338 100644
--- a/mayan/apps/authentication/tests/test_views.py
+++ b/mayan/apps/authentication/tests/test_views.py
@@ -5,9 +5,9 @@ from django.core import mail
from django.test import override_settings
from django.urls import reverse
-from common.tests import GenericViewTestCase
-from smart_settings.classes import Namespace
-from user_management.tests.literals import (
+from mayan.apps.common.tests import GenericViewTestCase
+from mayan.apps.smart_settings.classes import Namespace
+from mayan.apps.user_management.tests.literals import (
TEST_ADMIN_EMAIL, TEST_ADMIN_PASSWORD, TEST_USER_PASSWORD_EDITED,
TEST_ADMIN_USERNAME
)
diff --git a/mayan/apps/authentication/views.py b/mayan/apps/authentication/views.py
index fdee5d0b90..8907285954 100644
--- a/mayan/apps/authentication/views.py
+++ b/mayan/apps/authentication/views.py
@@ -15,8 +15,8 @@ from django.utils.translation import ugettext_lazy as _
from stronghold.decorators import public
-from common.settings import setting_project_title, setting_project_url
import mayan
+from mayan.apps.common.settings import setting_project_title, setting_project_url
from .forms import EmailAuthenticationForm, UsernameAuthenticationForm
from .settings import setting_login_method, setting_maximum_session_length
diff --git a/mayan/apps/cabinets/__init__.py b/mayan/apps/cabinets/__init__.py
index 14589dadfe..0f37e10213 100644
--- a/mayan/apps/cabinets/__init__.py
+++ b/mayan/apps/cabinets/__init__.py
@@ -1,3 +1,3 @@
from __future__ import unicode_literals
-default_app_config = 'cabinets.apps.CabinetsApp'
+default_app_config = 'mayan.apps.cabinets.apps.CabinetsApp'
diff --git a/mayan/apps/cabinets/api_views.py b/mayan/apps/cabinets/api_views.py
index 2bf075a55e..ff3f9d99e5 100644
--- a/mayan/apps/cabinets/api_views.py
+++ b/mayan/apps/cabinets/api_views.py
@@ -5,11 +5,11 @@ from django.shortcuts import get_object_or_404
from rest_framework import generics
from rest_framework.response import Response
-from acls.models import AccessControlList
-from documents.models import Document
-from documents.permissions import permission_document_view
-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.rest_api.filters import MayanObjectPermissionsFilter
+from mayan.apps.rest_api.permissions import MayanPermission
from .models import Cabinet
from .permissions import (
diff --git a/mayan/apps/cabinets/apps.py b/mayan/apps/cabinets/apps.py
index 31cd038771..83cb69834a 100644
--- a/mayan/apps/cabinets/apps.py
+++ b/mayan/apps/cabinets/apps.py
@@ -3,14 +3,14 @@ from __future__ import unicode_literals
from django.apps import apps
from django.utils.translation import ugettext_lazy as _
-from acls import ModelPermission
-from acls.permissions import permission_acl_edit, permission_acl_view
-from common import (
+from mayan.apps.acls import ModelPermission
+from mayan.apps.acls.permissions import permission_acl_edit, permission_acl_view
+from mayan.apps.common import (
MayanAppConfig, menu_facet, menu_main, menu_multi_item, menu_object,
menu_sidebar
)
-from documents.search import document_page_search, document_search
-from navigation import SourceColumn
+from mayan.apps.documents.search import document_page_search, document_search
+from mayan.apps.navigation import SourceColumn
from .links import (
link_cabinet_list, link_document_cabinet_list,
@@ -30,9 +30,11 @@ from .widgets import widget_document_cabinets
class CabinetsApp(MayanAppConfig):
+ app_namespace = 'cabinets'
+ app_url = 'cabinets'
has_rest_api = True
has_tests = True
- name = 'cabinets'
+ name = 'mayan.apps.cabinets'
verbose_name = _('Cabinets')
def ready(self):
diff --git a/mayan/apps/cabinets/events.py b/mayan/apps/cabinets/events.py
index 8e389c51b5..bca867bd2a 100644
--- a/mayan/apps/cabinets/events.py
+++ b/mayan/apps/cabinets/events.py
@@ -2,7 +2,7 @@ from __future__ import absolute_import, unicode_literals
from django.utils.translation import ugettext_lazy as _
-from events import EventTypeNamespace
+from mayan.apps.events import EventTypeNamespace
namespace = EventTypeNamespace(name='cabinets', label=_('Cabinets'))
diff --git a/mayan/apps/cabinets/forms.py b/mayan/apps/cabinets/forms.py
index 4a37ab7d07..5876fefcc6 100644
--- a/mayan/apps/cabinets/forms.py
+++ b/mayan/apps/cabinets/forms.py
@@ -5,7 +5,7 @@ import logging
from django import forms
from django.utils.translation import ugettext_lazy as _
-from acls.models import AccessControlList
+from mayan.apps.acls.models import AccessControlList
from .models import Cabinet
diff --git a/mayan/apps/cabinets/icons.py b/mayan/apps/cabinets/icons.py
index 472aa9541e..879186abf0 100644
--- a/mayan/apps/cabinets/icons.py
+++ b/mayan/apps/cabinets/icons.py
@@ -1,6 +1,6 @@
from __future__ import absolute_import, unicode_literals
-from appearance.classes import Icon
+from mayan.apps.appearance.classes import Icon
icon_cabinet = Icon(driver_name='fontawesome', symbol='columns')
icon_cabinet_add = Icon(driver_name='fontawesome', symbol='plus')
diff --git a/mayan/apps/cabinets/links.py b/mayan/apps/cabinets/links.py
index 4799521a60..f1f6c12d1d 100644
--- a/mayan/apps/cabinets/links.py
+++ b/mayan/apps/cabinets/links.py
@@ -4,9 +4,9 @@ import copy
from django.utils.translation import ugettext_lazy as _
-from acls.links import link_acl_list
-from documents.permissions import permission_document_view
-from navigation import Link, get_cascade_condition
+from mayan.apps.acls.links import link_acl_list
+from mayan.apps.documents.permissions import permission_document_view
+from mayan.apps.navigation import Link, get_cascade_condition
from .icons import (
icon_cabinet_add, icon_cabinet_child_add, icon_cabinet_create,
diff --git a/mayan/apps/cabinets/menus.py b/mayan/apps/cabinets/menus.py
index d936d37ffa..5e2a9253b6 100644
--- a/mayan/apps/cabinets/menus.py
+++ b/mayan/apps/cabinets/menus.py
@@ -2,7 +2,7 @@ from __future__ import unicode_literals
from django.utils.translation import ugettext_lazy as _
-from navigation import Menu, get_cascade_condition
+from mayan.apps.navigation import Menu, get_cascade_condition
from .icons import icon_cabinet_list
from .permissions import permission_cabinet_create, permission_cabinet_view
diff --git a/mayan/apps/cabinets/models.py b/mayan/apps/cabinets/models.py
index 014d304285..fd4f5a2b6b 100644
--- a/mayan/apps/cabinets/models.py
+++ b/mayan/apps/cabinets/models.py
@@ -9,9 +9,9 @@ from django.utils.translation import ugettext_lazy as _
from mptt.fields import TreeForeignKey
from mptt.models import MPTTModel
-from acls.models import AccessControlList
-from documents.models import Document
-from documents.permissions import permission_document_view
+from mayan.apps.acls.models import AccessControlList
+from mayan.apps.documents.models import Document
+from mayan.apps.documents.permissions import permission_document_view
from .events import event_cabinets_add_document, event_cabinets_remove_document
from .search import cabinet_search # NOQA
diff --git a/mayan/apps/cabinets/permissions.py b/mayan/apps/cabinets/permissions.py
index effed2cffe..e6730ce111 100644
--- a/mayan/apps/cabinets/permissions.py
+++ b/mayan/apps/cabinets/permissions.py
@@ -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('cabinets', _('Cabinets'))
diff --git a/mayan/apps/cabinets/search.py b/mayan/apps/cabinets/search.py
index ffd9a888cc..24107d6f69 100644
--- a/mayan/apps/cabinets/search.py
+++ b/mayan/apps/cabinets/search.py
@@ -2,14 +2,14 @@ from __future__ import absolute_import, unicode_literals
from django.utils.translation import ugettext_lazy as _
-from dynamic_search.classes import SearchModel
+from mayan.apps.dynamic_search.classes import SearchModel
from .permissions import permission_cabinet_view
cabinet_search = SearchModel(
app_label='cabinets', model_name='Cabinet',
permission=permission_cabinet_view,
- serializer_string='cabinets.serializers.CabinetSerializer'
+ serializer_string='mayan.apps.cabinets.serializers.CabinetSerializer'
)
cabinet_search.add_model_field(
diff --git a/mayan/apps/cabinets/serializers.py b/mayan/apps/cabinets/serializers.py
index ced682ce2f..e3d6867123 100644
--- a/mayan/apps/cabinets/serializers.py
+++ b/mayan/apps/cabinets/serializers.py
@@ -6,11 +6,10 @@ from django.utils.translation import ugettext_lazy as _
from rest_framework import serializers
from rest_framework.reverse import reverse
from rest_framework.settings import api_settings
-
from rest_framework_recursive.fields import RecursiveField
-from documents.models import Document
-from documents.serializers import DocumentSerializer
+from mayan.apps.documents.models import Document
+from mayan.apps.documents.serializers import DocumentSerializer
from .models import Cabinet
diff --git a/mayan/apps/cabinets/tests/test_api.py b/mayan/apps/cabinets/tests/test_api.py
index 145194dbe9..52f7d922db 100644
--- a/mayan/apps/cabinets/tests/test_api.py
+++ b/mayan/apps/cabinets/tests/test_api.py
@@ -8,8 +8,8 @@ from django.utils.encoding import force_text
from rest_framework import status
from rest_framework.test import APITestCase
-from documents.tests import DocumentTestMixin
-from user_management.tests.literals import (
+from mayan.apps.documents.tests import DocumentTestMixin
+from mayan.apps.user_management.tests.literals import (
TEST_ADMIN_EMAIL, TEST_ADMIN_PASSWORD, TEST_ADMIN_USERNAME
)
diff --git a/mayan/apps/cabinets/tests/test_events.py b/mayan/apps/cabinets/tests/test_events.py
index e402b69403..08778b8330 100644
--- a/mayan/apps/cabinets/tests/test_events.py
+++ b/mayan/apps/cabinets/tests/test_events.py
@@ -2,7 +2,7 @@ from __future__ import unicode_literals
from actstream.models import Action
-from documents.tests.test_models import GenericDocumentTestCase
+from mayan.apps.documents.tests.test_models import GenericDocumentTestCase
from ..events import (
event_cabinets_add_document, event_cabinets_remove_document
diff --git a/mayan/apps/cabinets/tests/test_models.py b/mayan/apps/cabinets/tests/test_models.py
index 6f40297b88..44ba3ac4df 100644
--- a/mayan/apps/cabinets/tests/test_models.py
+++ b/mayan/apps/cabinets/tests/test_models.py
@@ -3,8 +3,8 @@ from __future__ import unicode_literals
from django.core.exceptions import ValidationError
from django.test import override_settings
-from common.tests import BaseTestCase
-from documents.tests import DocumentTestMixin
+from mayan.apps.common.tests import BaseTestCase
+from mayan.apps.documents.tests import DocumentTestMixin
from ..models import Cabinet
diff --git a/mayan/apps/cabinets/tests/test_views.py b/mayan/apps/cabinets/tests/test_views.py
index 999c683d5c..abe574ca07 100644
--- a/mayan/apps/cabinets/tests/test_views.py
+++ b/mayan/apps/cabinets/tests/test_views.py
@@ -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 Cabinet
from ..permissions import (
diff --git a/mayan/apps/cabinets/tests/test_wizard_steps.py b/mayan/apps/cabinets/tests/test_wizard_steps.py
index 09e444d1b7..a36f5ae9d9 100644
--- a/mayan/apps/cabinets/tests/test_wizard_steps.py
+++ b/mayan/apps/cabinets/tests/test_wizard_steps.py
@@ -1,15 +1,15 @@
from __future__ import unicode_literals
-from documents.models import Document
-from documents.permissions import permission_document_create
-from documents.tests import (
+from mayan.apps.documents.models import Document
+from mayan.apps.documents.permissions import permission_document_create
+from mayan.apps.documents.tests import (
GenericDocumentViewTestCase, TEST_SMALL_DOCUMENT_PATH,
)
-from sources.models import WebFormSource
-from sources.tests.literals import (
+from mayan.apps.sources.models import WebFormSource
+from mayan.apps.sources.tests.literals import (
TEST_SOURCE_LABEL, TEST_SOURCE_UNCOMPRESS_N
)
-from sources.wizards import WizardStep
+from mayan.apps.sources.wizards import WizardStep
from ..models import Cabinet
from ..wizard_steps import WizardStepCabinets
diff --git a/mayan/apps/cabinets/views.py b/mayan/apps/cabinets/views.py
index b833f1ed90..8ca341b002 100644
--- a/mayan/apps/cabinets/views.py
+++ b/mayan/apps/cabinets/views.py
@@ -8,14 +8,14 @@ from django.template import RequestContext
from django.urls import reverse_lazy
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 (
MultipleObjectFormActionView, SingleObjectCreateView,
SingleObjectDeleteView, SingleObjectEditView, SingleObjectListView
)
-from documents.permissions import permission_document_view
-from documents.models import Document
-from documents.views import DocumentListView
+from mayan.apps.documents.permissions import permission_document_view
+from mayan.apps.documents.models import Document
+from mayan.apps.documents.views import DocumentListView
from .forms import CabinetListForm
from .icons import icon_cabinet
diff --git a/mayan/apps/cabinets/wizard_steps.py b/mayan/apps/cabinets/wizard_steps.py
index 5dd73c073c..7c37006e70 100644
--- a/mayan/apps/cabinets/wizard_steps.py
+++ b/mayan/apps/cabinets/wizard_steps.py
@@ -6,7 +6,7 @@ from django.apps import apps
from django.utils.encoding import force_text
from django.utils.translation import ugettext_lazy as _
-from sources.wizards import WizardStep
+from mayan.apps.sources.wizards import WizardStep
from .forms import CabinetListForm
from .permissions import permission_cabinet_add_document
diff --git a/mayan/apps/checkouts/__init__.py b/mayan/apps/checkouts/__init__.py
index e63340ef67..063c4bd45e 100644
--- a/mayan/apps/checkouts/__init__.py
+++ b/mayan/apps/checkouts/__init__.py
@@ -1,3 +1,3 @@
from __future__ import unicode_literals
-default_app_config = 'checkouts.apps.CheckoutsApp'
+default_app_config = 'mayan.apps.checkouts.apps.CheckoutsApp'
diff --git a/mayan/apps/checkouts/api_views.py b/mayan/apps/checkouts/api_views.py
index 0a4a2aba2a..d48dd2c669 100644
--- a/mayan/apps/checkouts/api_views.py
+++ b/mayan/apps/checkouts/api_views.py
@@ -2,8 +2,8 @@ from __future__ import absolute_import, unicode_literals
from rest_framework import generics
-from acls.models import AccessControlList
-from documents.permissions import permission_document_view
+from mayan.apps.acls.models import AccessControlList
+from mayan.apps.documents.permissions import permission_document_view
from .models import DocumentCheckout
from .permissions import (
diff --git a/mayan/apps/checkouts/apps.py b/mayan/apps/checkouts/apps.py
index 56f21be914..7fc6105f3a 100644
--- a/mayan/apps/checkouts/apps.py
+++ b/mayan/apps/checkouts/apps.py
@@ -8,10 +8,10 @@ from django.apps import apps
from django.db.models.signals import pre_save
from django.utils.translation import ugettext_lazy as _
-from acls import ModelPermission
-from common import MayanAppConfig, menu_facet, menu_main, menu_sidebar
-from common.dashboards import dashboard_main
-from events import ModelEventType
+from mayan.apps.acls import ModelPermission
+from mayan.apps.common import MayanAppConfig, menu_facet, menu_main, menu_sidebar
+from mayan.apps.common.dashboards import dashboard_main
+from mayan.apps.events import ModelEventType
from mayan.celery import app
from .dashboard_widgets import DashboardWidgetTotalCheckouts
@@ -35,9 +35,11 @@ from .tasks import task_check_expired_check_outs # NOQA
class CheckoutsApp(MayanAppConfig):
+ app_namespace = 'checkouts'
+ app_url = 'checkouts'
has_rest_api = True
has_tests = True
- name = 'checkouts'
+ name = 'mayan.apps.checkouts'
verbose_name = _('Checkouts')
def ready(self):
@@ -94,7 +96,7 @@ class CheckoutsApp(MayanAppConfig):
app.conf.CELERYBEAT_SCHEDULE.update(
{
'task_check_expired_check_outs': {
- 'task': 'checkouts.tasks.task_check_expired_check_outs',
+ 'task': 'mayan.apps.checkouts.tasks.task_check_expired_check_outs',
'schedule': timedelta(
seconds=CHECK_EXPIRED_CHECK_OUTS_INTERVAL
),
@@ -111,7 +113,7 @@ class CheckoutsApp(MayanAppConfig):
app.conf.CELERY_ROUTES.update(
{
- 'checkouts.tasks.task_check_expired_check_outs': {
+ 'mayan.apps.checkouts.tasks.task_check_expired_check_outs': {
'queue': 'checkouts_periodic'
},
}
diff --git a/mayan/apps/checkouts/dashboard_widgets.py b/mayan/apps/checkouts/dashboard_widgets.py
index 723600208a..5942ca27f4 100644
--- a/mayan/apps/checkouts/dashboard_widgets.py
+++ b/mayan/apps/checkouts/dashboard_widgets.py
@@ -4,8 +4,8 @@ from django.apps import apps
from django.urls import reverse_lazy
from django.utils.translation import ugettext_lazy as _
-from common.classes import DashboardWidgetNumeric
-from documents.permissions import permission_document_view
+from mayan.apps.common.classes import DashboardWidgetNumeric
+from mayan.apps.documents.permissions import permission_document_view
from .icons import icon_dashboard_checkouts
from .permissions import permission_document_checkout_detail_view
diff --git a/mayan/apps/checkouts/events.py b/mayan/apps/checkouts/events.py
index 2ce427beea..69036d2a29 100644
--- a/mayan/apps/checkouts/events.py
+++ b/mayan/apps/checkouts/events.py
@@ -2,7 +2,7 @@ from __future__ import absolute_import, unicode_literals
from django.utils.translation import ugettext_lazy as _
-from events import EventTypeNamespace
+from mayan.apps.events import EventTypeNamespace
namespace = EventTypeNamespace(name='checkouts', label=_('Checkouts'))
diff --git a/mayan/apps/checkouts/forms.py b/mayan/apps/checkouts/forms.py
index 8500dc07b3..355d888424 100644
--- a/mayan/apps/checkouts/forms.py
+++ b/mayan/apps/checkouts/forms.py
@@ -3,7 +3,7 @@ from __future__ import unicode_literals
from django import forms
from django.utils.translation import ugettext_lazy as _
-from common.forms import DetailForm
+from mayan.apps.common.forms import DetailForm
from .literals import STATE_LABELS
from .models import DocumentCheckout
diff --git a/mayan/apps/checkouts/icons.py b/mayan/apps/checkouts/icons.py
index b618bf24f8..8fedf84d7e 100644
--- a/mayan/apps/checkouts/icons.py
+++ b/mayan/apps/checkouts/icons.py
@@ -1,6 +1,6 @@
from __future__ import absolute_import, unicode_literals
-from appearance.classes import Icon
+from mayan.apps.appearance.classes import Icon
icon_checkout_info = Icon(driver_name='fontawesome', symbol='shopping-cart')
icon_dashboard_checkouts = Icon(
diff --git a/mayan/apps/checkouts/links.py b/mayan/apps/checkouts/links.py
index 99a3038f06..cb77c54477 100644
--- a/mayan/apps/checkouts/links.py
+++ b/mayan/apps/checkouts/links.py
@@ -2,7 +2,7 @@ from __future__ import absolute_import, unicode_literals
from django.utils.translation import ugettext_lazy as _
-from navigation import Link
+from mayan.apps.navigation import Link
from .icons import icon_checkout_info
from .permissions import (
diff --git a/mayan/apps/checkouts/managers.py b/mayan/apps/checkouts/managers.py
index 5f20d00efe..bdeb22f3e7 100644
--- a/mayan/apps/checkouts/managers.py
+++ b/mayan/apps/checkouts/managers.py
@@ -6,7 +6,7 @@ from django.apps import apps
from django.db import models
from django.utils.timezone import now
-from documents.models import Document
+from mayan.apps.documents.models import Document
from .events import (
event_document_auto_check_in, event_document_check_in,
diff --git a/mayan/apps/checkouts/models.py b/mayan/apps/checkouts/models.py
index 43a38d8848..c2b535b973 100644
--- a/mayan/apps/checkouts/models.py
+++ b/mayan/apps/checkouts/models.py
@@ -10,7 +10,7 @@ from django.utils.encoding import force_text, python_2_unicode_compatible
from django.utils.timezone import now
from django.utils.translation import ugettext_lazy as _
-from documents.models import Document
+from mayan.apps.documents.models import Document
from .events import event_document_check_out
from .exceptions import DocumentAlreadyCheckedOut
diff --git a/mayan/apps/checkouts/permissions.py b/mayan/apps/checkouts/permissions.py
index d385538564..fa0f0468ed 100644
--- a/mayan/apps/checkouts/permissions.py
+++ b/mayan/apps/checkouts/permissions.py
@@ -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('checkouts', _('Document checkout'))
diff --git a/mayan/apps/checkouts/queues.py b/mayan/apps/checkouts/queues.py
index 91896cda50..3792211019 100644
--- a/mayan/apps/checkouts/queues.py
+++ b/mayan/apps/checkouts/queues.py
@@ -2,12 +2,12 @@ from __future__ import absolute_import, unicode_literals
from django.utils.translation import ugettext_lazy as _
-from task_manager.classes import CeleryQueue
+from mayan.apps.task_manager.classes import CeleryQueue
queue_checkouts_periodic = CeleryQueue(
name='checkouts_periodic', label=_('Checkouts periodic'), transient=True
)
queue_checkouts_periodic.add_task_type(
- name='task_check_expired_check_outs',
+ name='mayan.apps.task_check_expired_check_outs',
label=_('Check expired checkouts')
)
diff --git a/mayan/apps/checkouts/serializers.py b/mayan/apps/checkouts/serializers.py
index 0c6564cb45..4a5c1c4478 100644
--- a/mayan/apps/checkouts/serializers.py
+++ b/mayan/apps/checkouts/serializers.py
@@ -4,9 +4,9 @@ from django.utils.translation import ugettext_lazy as _
from rest_framework import serializers
-from acls.models import AccessControlList
-from documents.models import Document
-from documents.serializers import DocumentSerializer
+from mayan.apps.acls.models import AccessControlList
+from mayan.apps.documents.models import Document
+from mayan.apps.documents.serializers import DocumentSerializer
from .models import DocumentCheckout
from .permissions import permission_document_checkout
diff --git a/mayan/apps/checkouts/tasks.py b/mayan/apps/checkouts/tasks.py
index 2f437ad8e1..68f17b4865 100644
--- a/mayan/apps/checkouts/tasks.py
+++ b/mayan/apps/checkouts/tasks.py
@@ -4,8 +4,8 @@ import logging
from django.apps import apps
-from lock_manager import LockError
-from lock_manager.runtime import locking_backend
+from mayan.apps.lock_manager import LockError
+from mayan.apps.lock_manager.runtime import locking_backend
from mayan.celery import app
from .literals import CHECKOUT_EXPIRATION_LOCK_EXPIRE
diff --git a/mayan/apps/checkouts/tests/test_api.py b/mayan/apps/checkouts/tests/test_api.py
index 5fb2122658..3c8df4d991 100644
--- a/mayan/apps/checkouts/tests/test_api.py
+++ b/mayan/apps/checkouts/tests/test_api.py
@@ -8,9 +8,9 @@ from django.utils.timezone import now
from rest_framework import status
-from documents.tests import DocumentTestMixin
-from documents.permissions import permission_document_view
-from rest_api.tests import BaseAPITestCase
+from mayan.apps.documents.tests import DocumentTestMixin
+from mayan.apps.documents.permissions import permission_document_view
+from mayan.apps.rest_api.tests import BaseAPITestCase
from ..models import DocumentCheckout
from ..permissions import (
diff --git a/mayan/apps/checkouts/tests/test_models.py b/mayan/apps/checkouts/tests/test_models.py
index f3c08675f2..57af52e9bf 100644
--- a/mayan/apps/checkouts/tests/test_models.py
+++ b/mayan/apps/checkouts/tests/test_models.py
@@ -7,9 +7,9 @@ import time
from django.test import override_settings
from django.utils.timezone import now
-from common.tests import BaseTestCase
-from documents.tests import DocumentTestMixin
-from documents.tests.literals import TEST_SMALL_DOCUMENT_PATH
+from mayan.apps.common.tests import BaseTestCase
+from mayan.apps.documents.tests import DocumentTestMixin
+from mayan.apps.documents.tests.literals import TEST_SMALL_DOCUMENT_PATH
from ..exceptions import (
DocumentAlreadyCheckedOut, DocumentNotCheckedOut,
diff --git a/mayan/apps/checkouts/tests/test_views.py b/mayan/apps/checkouts/tests/test_views.py
index 8f6b74b843..3daa2ab210 100644
--- a/mayan/apps/checkouts/tests/test_views.py
+++ b/mayan/apps/checkouts/tests/test_views.py
@@ -5,10 +5,10 @@ import logging
from django.utils.timezone import now
-from common.literals import TIME_DELTA_UNIT_DAYS
-from documents.tests import GenericDocumentViewTestCase
-from sources.links import link_upload_version
-from user_management.tests.literals import (
+from mayan.apps.common.literals import TIME_DELTA_UNIT_DAYS
+from mayan.apps.documents.tests import GenericDocumentViewTestCase
+from mayan.apps.sources.links import link_upload_version
+from mayan.apps.user_management.tests.literals import (
TEST_USER_PASSWORD, TEST_USER_USERNAME, TEST_ADMIN_PASSWORD,
TEST_ADMIN_USERNAME,
)
diff --git a/mayan/apps/checkouts/views.py b/mayan/apps/checkouts/views.py
index fcacd5a753..1cc8abcc04 100644
--- a/mayan/apps/checkouts/views.py
+++ b/mayan/apps/checkouts/views.py
@@ -6,14 +6,13 @@ from django.shortcuts import get_object_or_404
from django.urls import reverse
from django.utils.translation import ugettext_lazy as _
-from documents.models import Document
-from documents.views import DocumentListView
-
-from acls.models import AccessControlList
-from common.generics import (
+from mayan.apps.acls.models import AccessControlList
+from mayan.apps.common.generics import (
ConfirmView, SingleObjectCreateView, SingleObjectDetailView
)
-from common.utils import encapsulate
+from mayan.apps.common.utils import encapsulate
+from mayan.apps.documents.models import Document
+from mayan.apps.documents.views import DocumentListView
from .exceptions import DocumentAlreadyCheckedOut, DocumentNotCheckedOut
from .forms import DocumentCheckoutForm, DocumentCheckoutDefailForm
diff --git a/mayan/apps/checkouts/widgets.py b/mayan/apps/checkouts/widgets.py
index 063c27de3d..459506ef69 100644
--- a/mayan/apps/checkouts/widgets.py
+++ b/mayan/apps/checkouts/widgets.py
@@ -6,7 +6,7 @@ from django import forms
from django.utils.timezone import now
from django.utils.translation import ugettext_lazy as _
-from common.literals import TIME_DELTA_UNIT_CHOICES
+from mayan.apps.common.literals import TIME_DELTA_UNIT_CHOICES
class SplitTimeDeltaWidget(forms.widgets.MultiWidget):
diff --git a/mayan/apps/common/__init__.py b/mayan/apps/common/__init__.py
index 647dde0ede..d97a8218a5 100644
--- a/mayan/apps/common/__init__.py
+++ b/mayan/apps/common/__init__.py
@@ -4,4 +4,4 @@ from .apps import MayanAppConfig # NOQA
from .classes import MissingItem # NOQA
from .menus import * # NOQA
-default_app_config = 'common.apps.CommonApp'
+default_app_config = 'mayan.apps.common.apps.CommonApp'
diff --git a/mayan/apps/common/apps.py b/mayan/apps/common/apps.py
index 71e86aaf6a..fff79777b2 100644
--- a/mayan/apps/common/apps.py
+++ b/mayan/apps/common/apps.py
@@ -47,10 +47,11 @@ logger = logging.getLogger(__name__)
class MayanAppConfig(apps.AppConfig):
- app_url = None
app_namespace = None
+ app_url = None
def ready(self):
+ logger.debug('Initializing app: %s', self.name)
from mayan.urls import urlpatterns
if self.app_url:
@@ -70,7 +71,7 @@ class MayanAppConfig(apps.AppConfig):
),
except ImportError as exception:
if force_text(exception) not in ('No module named urls', 'No module named \'{}.urls\''.format(self.name)):
- logger.error(
+ logger.exception(
'Import time error when running AppConfig.ready() of app '
'"%s".', self.name
)
@@ -78,10 +79,11 @@ class MayanAppConfig(apps.AppConfig):
class CommonApp(MayanAppConfig):
+ app_namespace = 'common'
app_url = ''
has_rest_api = True
has_tests = True
- name = 'common'
+ name = 'mayan.apps.common'
verbose_name = _('Common')
def ready(self):
@@ -96,7 +98,7 @@ class CommonApp(MayanAppConfig):
app.conf.CELERYBEAT_SCHEDULE.update(
{
'task_delete_stale_uploads': {
- 'task': 'common.tasks.task_delete_stale_uploads',
+ 'task': 'mayan.apps.common.tasks.task_delete_stale_uploads',
'schedule': timedelta(
seconds=DELETE_STALE_UPLOADS_INTERVAL
),
@@ -119,7 +121,7 @@ class CommonApp(MayanAppConfig):
app.conf.CELERY_ROUTES.update(
{
- 'common.tasks.task_delete_stale_uploads': {
+ 'mayan.apps.common.tasks.task_delete_stale_uploads': {
'queue': 'common_periodic'
},
}
@@ -191,7 +193,7 @@ class CommonApp(MayanAppConfig):
'disable_existing_loggers': False,
'formatters': {
'intermediate': {
- 'format': '%(name)s <%(process)d> [%(levelname)s] "%(funcName)s() line %(lineno)d %(message)s"'
+ 'format': '%(name)s <%(process)d> [%(levelname)s] "%(funcName)s() line %(lineno)d %(message)s"',
},
'logfile': {
'format': '%(asctime)s %(name)s <%(process)d> [%(levelname)s] "%(funcName)s() line %(lineno)d %(message)s"'
diff --git a/mayan/apps/common/compressed_files.py b/mayan/apps/common/compressed_files.py
index 650aa1e527..e9b819fdd5 100644
--- a/mayan/apps/common/compressed_files.py
+++ b/mayan/apps/common/compressed_files.py
@@ -12,7 +12,7 @@ except ImportError:
from django.core.files.uploadedfile import SimpleUploadedFile
-from mimetype.api import get_mimetype
+from mayan.apps.mimetype.api import get_mimetype
from .exceptions import NoMIMETypeMatch
diff --git a/mayan/apps/common/icons.py b/mayan/apps/common/icons.py
index 69e3b34c8c..a1e6c3e960 100644
--- a/mayan/apps/common/icons.py
+++ b/mayan/apps/common/icons.py
@@ -1,6 +1,6 @@
from __future__ import absolute_import, unicode_literals
-from appearance.classes import Icon
+from mayan.apps.appearance.classes import Icon
icon_about = Icon(driver_name='fontawesome', symbol='info')
icon_assign_remove_add = Icon(driver_name='fontawesome', symbol='plus')
diff --git a/mayan/apps/common/links.py b/mayan/apps/common/links.py
index a436040345..f73d5a93a1 100644
--- a/mayan/apps/common/links.py
+++ b/mayan/apps/common/links.py
@@ -3,8 +3,8 @@ from __future__ import unicode_literals
from django.apps import apps
from django.utils.translation import ugettext_lazy as _
-from navigation import Link
-from navigation.classes import Separator, Text
+from mayan.apps.navigation import Link
+from mayan.apps.navigation.classes import Separator, Text
from .icons import (
icon_about, icon_check_version, icon_current_user_details,
diff --git a/mayan/apps/common/management/commands/convertdb.py b/mayan/apps/common/management/commands/convertdb.py
index 4e92328683..bd822aba4e 100644
--- a/mayan/apps/common/management/commands/convertdb.py
+++ b/mayan/apps/common/management/commands/convertdb.py
@@ -11,8 +11,8 @@ from django.core.management.base import CommandError
from django.utils.encoding import force_text
from django.utils.translation import ugettext_lazy as _
-from common.utils import fs_cleanup
-from documents.models import DocumentType
+from mayan.apps.common.utils import fs_cleanup
+from mayan.apps.documents.models import DocumentType
CONVERTDB_FOLDER = 'convertdb'
CONVERTDB_OUTPUT_FILENAME = 'migrate.json'
diff --git a/mayan/apps/common/menus.py b/mayan/apps/common/menus.py
index f5ed0b1748..7ee8c2e9e8 100644
--- a/mayan/apps/common/menus.py
+++ b/mayan/apps/common/menus.py
@@ -2,7 +2,7 @@ from __future__ import unicode_literals
from django.utils.translation import ugettext_lazy as _
-from navigation import Menu
+from mayan.apps.navigation import Menu
from .icons import icon_menu_about, icon_menu_user
diff --git a/mayan/apps/common/migrations/0001_initial.py b/mayan/apps/common/migrations/0001_initial.py
index 64d69475c5..932065f6cf 100644
--- a/mayan/apps/common/migrations/0001_initial.py
+++ b/mayan/apps/common/migrations/0001_initial.py
@@ -5,7 +5,7 @@ from django.db import models, migrations
from django.conf import settings
from django.core.files.storage import FileSystemStorage
-import common.models
+import mayan.apps.common.models
class Migration(migrations.Migration):
@@ -77,7 +77,7 @@ class Migration(migrations.Migration):
),
(
'file', models.FileField(
- upload_to=common.models.upload_to,
+ upload_to=mayan.apps.common.models.upload_to,
storage=FileSystemStorage(),
verbose_name='File'
)
diff --git a/mayan/apps/common/migrations/0010_auto_20180403_0702.py b/mayan/apps/common/migrations/0010_auto_20180403_0702.py
index 5b267ff587..3cf2931c30 100644
--- a/mayan/apps/common/migrations/0010_auto_20180403_0702.py
+++ b/mayan/apps/common/migrations/0010_auto_20180403_0702.py
@@ -2,7 +2,7 @@
# Generated by Django 1.11.11 on 2018-04-03 07:02
from __future__ import unicode_literals
-import common.models
+import mayan.apps.common.models
import django.core.files.storage
from django.db import migrations, models
@@ -17,6 +17,6 @@ class Migration(migrations.Migration):
migrations.AlterField(
model_name='shareduploadedfile',
name='file',
- field=models.FileField(storage=django.core.files.storage.FileSystemStorage(location=b'mayan/media/shared_files'), upload_to=common.models.upload_to, verbose_name='File'),
+ field=models.FileField(storage=django.core.files.storage.FileSystemStorage(location=b'mayan/media/shared_files'), upload_to=mayan.apps.common.models.upload_to, verbose_name='File'),
),
]
diff --git a/mayan/apps/common/migrations/0011_auto_20180429_0758.py b/mayan/apps/common/migrations/0011_auto_20180429_0758.py
index 131b172666..be68c11841 100644
--- a/mayan/apps/common/migrations/0011_auto_20180429_0758.py
+++ b/mayan/apps/common/migrations/0011_auto_20180429_0758.py
@@ -2,7 +2,7 @@
# Generated by Django 1.11.11 on 2018-04-29 07:58
from __future__ import unicode_literals
-import common.models
+import mayan.apps.common.models
import django.core.files.storage
from django.db import migrations, models
@@ -17,6 +17,6 @@ class Migration(migrations.Migration):
migrations.AlterField(
model_name='shareduploadedfile',
name='file',
- field=models.FileField(storage=django.core.files.storage.FileSystemStorage(location=b'/home/rosarior/development/mayan-edms/mayan/media/shared_files'), upload_to=common.models.upload_to, verbose_name='File'),
+ field=models.FileField(storage=django.core.files.storage.FileSystemStorage(location=b'/home/rosarior/development/mayan-edms/mayan/media/shared_files'), upload_to=mayan.apps.common.models.upload_to, verbose_name='File'),
),
]
diff --git a/mayan/apps/common/mixins.py b/mayan/apps/common/mixins.py
index e3541fce2e..b3a128d9d2 100644
--- a/mayan/apps/common/mixins.py
+++ b/mayan/apps/common/mixins.py
@@ -8,9 +8,8 @@ from django.http import HttpResponseRedirect
from django.shortcuts import resolve_url
from django.utils.translation import ungettext, ugettext_lazy as _
-from permissions import Permission
-
-from acls.models import AccessControlList
+from mayan.apps.acls.models import AccessControlList
+from mayan.apps.permissions import Permission
from .exceptions import ActionError
from .forms import DynamicForm
diff --git a/mayan/apps/common/permissions_runtime.py b/mayan/apps/common/permissions_runtime.py
index 578b19ed2d..25527c34cf 100644
--- a/mayan/apps/common/permissions_runtime.py
+++ b/mayan/apps/common/permissions_runtime.py
@@ -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('common', _('Common'))
diff --git a/mayan/apps/common/queues.py b/mayan/apps/common/queues.py
index b6cda215d0..bf649abb48 100644
--- a/mayan/apps/common/queues.py
+++ b/mayan/apps/common/queues.py
@@ -2,7 +2,7 @@ from __future__ import absolute_import, unicode_literals
from django.utils.translation import ugettext_lazy as _
-from task_manager.classes import CeleryQueue
+from mayan.apps.task_manager.classes import CeleryQueue
queue_default = CeleryQueue(
name='default', label=_('Default'), is_default_queue=True
@@ -12,6 +12,6 @@ queue_common_periodic = CeleryQueue(
name='common_periodic', label=_('Common periodic'), transient=True
)
queue_common_periodic.add_task_type(
- name='common.tasks.task_delete_stale_uploads',
+ name='mayan.apps.common.tasks.task_delete_stale_uploads',
label=_('Delete stale uploads')
)
diff --git a/mayan/apps/common/settings.py b/mayan/apps/common/settings.py
index f28ce9cb45..612707460d 100644
--- a/mayan/apps/common/settings.py
+++ b/mayan/apps/common/settings.py
@@ -7,7 +7,7 @@ from django.conf import settings
from django.utils.translation import ugettext_lazy as _
import mayan
-from smart_settings import Namespace
+from mayan.apps.smart_settings import Namespace
namespace = Namespace(name='common', label=_('Common'))
diff --git a/mayan/apps/common/tests/base.py b/mayan/apps/common/tests/base.py
index 91a2b611b9..5cdd423e23 100644
--- a/mayan/apps/common/tests/base.py
+++ b/mayan/apps/common/tests/base.py
@@ -4,10 +4,10 @@ from django.test import TestCase
from django_downloadview import assert_download_response
-from acls.tests.mixins import ACLTestCaseMixin
-from permissions.classes import Permission
-from smart_settings.classes import Namespace
-from user_management.tests.mixins import UserTestCaseMixin
+from mayan.apps.acls.tests.mixins import ACLTestCaseMixin
+from mayan.apps.permissions.classes import Permission
+from mayan.apps.smart_settings.classes import Namespace
+from mayan.apps.user_management.tests.mixins import UserTestCaseMixin
from .mixins import (
ClientMethodsTestCaseMixin, ContentTypeCheckTestCaseMixin,
diff --git a/mayan/apps/common/tests/test_api.py b/mayan/apps/common/tests/test_api.py
index e254fb0bd9..a3d6a48650 100644
--- a/mayan/apps/common/tests/test_api.py
+++ b/mayan/apps/common/tests/test_api.py
@@ -3,7 +3,7 @@ from __future__ import unicode_literals
from django.urls import reverse
from django.test import override_settings
-from rest_api.tests import BaseAPITestCase
+from mayan.apps.rest_api.tests import BaseAPITestCase
from ..classes import Template
diff --git a/mayan/apps/common/tests/test_compressed_files.py b/mayan/apps/common/tests/test_compressed_files.py
index a89d0d3f61..30e1634d87 100644
--- a/mayan/apps/common/tests/test_compressed_files.py
+++ b/mayan/apps/common/tests/test_compressed_files.py
@@ -1,6 +1,6 @@
from __future__ import unicode_literals
-from common.tests import BaseTestCase
+from mayan.apps.common.tests import BaseTestCase
from ..compressed_files import Archive, TarArchive, ZipArchive
diff --git a/mayan/apps/common/tests/test_models.py b/mayan/apps/common/tests/test_models.py
index 7ef6106649..064d0cc542 100644
--- a/mayan/apps/common/tests/test_models.py
+++ b/mayan/apps/common/tests/test_models.py
@@ -1,7 +1,7 @@
from __future__ import unicode_literals
-from common.tests import BaseTestCase
-from user_management.tests.mixins import UserTestMixin
+from mayan.apps.common.tests import BaseTestCase
+from mayan.apps.user_management.tests.mixins import UserTestMixin
class UserLocaleProfileTestCase(UserTestMixin, BaseTestCase):
diff --git a/mayan/apps/common/tests/test_views.py b/mayan/apps/common/tests/test_views.py
index 407a1c2495..911c9481b3 100644
--- a/mayan/apps/common/tests/test_views.py
+++ b/mayan/apps/common/tests/test_views.py
@@ -3,7 +3,7 @@ from __future__ import absolute_import, unicode_literals
from django.contrib.auth import get_user_model
from django.contrib.contenttypes.models import ContentType
-from acls import ModelPermission
+from mayan.apps.acls import ModelPermission
from ..models import ErrorLogEntry
from ..permissions_runtime import permission_error_log_view
diff --git a/mayan/apps/common/utils.py b/mayan/apps/common/utils.py
index 48b509f2b6..a9791343e0 100644
--- a/mayan/apps/common/utils.py
+++ b/mayan/apps/common/utils.py
@@ -16,8 +16,8 @@ from django.utils.http import (
from django.utils.six.moves import reduce as reduce_function, xmlrpc_client
from django.utils.translation import ugettext_lazy as _
-from common.compat import dict_type, dictionary_type
import mayan
+from mayan.apps.common.compat import dict_type, dictionary_type
from .exceptions import NotLatestVersion, UnknownLatestVersion
from .literals import DJANGO_SQLITE_BACKEND, MAYAN_PYPI_NAME, PYPI_URL
diff --git a/mayan/apps/common/views.py b/mayan/apps/common/views.py
index 0fa384192f..316f817a38 100644
--- a/mayan/apps/common/views.py
+++ b/mayan/apps/common/views.py
@@ -14,7 +14,7 @@ from django.utils.http import urlencode
from django.utils.translation import ugettext_lazy as _
from django.views.generic import RedirectView, TemplateView
-from acls.models import AccessControlList
+from mayan.apps.acls.models import AccessControlList
from .exceptions import NotLatestVersion, UnknownLatestVersion
from .forms import (
diff --git a/mayan/apps/converter/__init__.py b/mayan/apps/converter/__init__.py
index 05b6a1632a..a643e11bef 100644
--- a/mayan/apps/converter/__init__.py
+++ b/mayan/apps/converter/__init__.py
@@ -6,4 +6,4 @@ from .transformations import ( # NOQA
TransformationZoom
)
-default_app_config = 'converter.apps.ConverterApp'
+default_app_config = 'mayan.apps.converter.apps.ConverterApp'
diff --git a/mayan/apps/converter/apps.py b/mayan/apps/converter/apps.py
index f742adc89a..54d448c76c 100644
--- a/mayan/apps/converter/apps.py
+++ b/mayan/apps/converter/apps.py
@@ -3,9 +3,8 @@ from __future__ import unicode_literals
from django.utils.encoding import force_text
from django.utils.translation import ugettext_lazy as _
-from common import MayanAppConfig, menu_object, menu_sidebar
-
-from navigation import SourceColumn
+from mayan.apps.common import MayanAppConfig, menu_object, menu_sidebar
+from mayan.apps.navigation import SourceColumn
from .links import (
link_transformation_create, link_transformation_delete,
@@ -15,8 +14,10 @@ from .licenses import * # NOQA
class ConverterApp(MayanAppConfig):
+ app_namespace = 'converter'
+ app_url = 'converter'
has_tests = True
- name = 'converter'
+ name = 'mayan.apps.converter'
verbose_name = _('Converter')
def ready(self):
diff --git a/mayan/apps/converter/backends/python.py b/mayan/apps/converter/backends/python.py
index 706c8a744d..d9f25261e9 100644
--- a/mayan/apps/converter/backends/python.py
+++ b/mayan/apps/converter/backends/python.py
@@ -12,7 +12,7 @@ import yaml
from django.utils.encoding import force_text
from django.utils.translation import ugettext_lazy as _
-from common.utils import fs_cleanup, mkstemp
+from mayan.apps.common.utils import fs_cleanup, mkstemp
from ..classes import ConverterBase
from ..exceptions import PageCountError
diff --git a/mayan/apps/converter/classes.py b/mayan/apps/converter/classes.py
index afdef6d93c..1aebf12d6e 100644
--- a/mayan/apps/converter/classes.py
+++ b/mayan/apps/converter/classes.py
@@ -11,9 +11,9 @@ import yaml
from django.utils.translation import ugettext_lazy as _
-from common.settings import setting_temporary_directory
-from common.utils import fs_cleanup, mkdtemp, mkstemp
-from mimetype.api import get_mimetype
+from mayan.apps.common.settings import setting_temporary_directory
+from mayan.apps.common.utils import fs_cleanup, mkdtemp, mkstemp
+from mayan.apps.mimetype.api import get_mimetype
from .exceptions import InvalidOfficeFormat, OfficeConversionError
from .literals import (
diff --git a/mayan/apps/converter/icons.py b/mayan/apps/converter/icons.py
index d87a5fc8d6..38285447b4 100644
--- a/mayan/apps/converter/icons.py
+++ b/mayan/apps/converter/icons.py
@@ -1,6 +1,6 @@
from __future__ import absolute_import, unicode_literals
-from appearance.classes import Icon
+from mayan.apps.appearance.classes import Icon
icon_transformation = Icon(driver_name='fontawesome', symbol='crop')
icon_transformation_create = Icon(driver_name='fontawesome', symbol='plus')
diff --git a/mayan/apps/converter/licenses.py b/mayan/apps/converter/licenses.py
index a319c0082f..bd8f90d569 100644
--- a/mayan/apps/converter/licenses.py
+++ b/mayan/apps/converter/licenses.py
@@ -1,6 +1,6 @@
from __future__ import unicode_literals
-from common.classes import Package
+from mayan.apps.common.classes import Package
Package(label='Pillow', license_text='''
The Python Imaging Library (PIL) is
diff --git a/mayan/apps/converter/links.py b/mayan/apps/converter/links.py
index f217428208..85dc35778c 100644
--- a/mayan/apps/converter/links.py
+++ b/mayan/apps/converter/links.py
@@ -3,7 +3,7 @@ from __future__ import unicode_literals
from django.apps import apps
from django.utils.translation import ugettext_lazy as _
-from navigation import Link
+from mayan.apps.navigation import Link
from .icons import icon_transformation, icon_transformation_create
from .permissions import (
diff --git a/mayan/apps/converter/migrations/0001_initial.py b/mayan/apps/converter/migrations/0001_initial.py
index 3b21ffe27b..0e67a82690 100644
--- a/mayan/apps/converter/migrations/0001_initial.py
+++ b/mayan/apps/converter/migrations/0001_initial.py
@@ -2,7 +2,8 @@
from __future__ import unicode_literals
from django.db import models, migrations
-import converter.models
+
+import mayan.apps.converter.models
class Migration(migrations.Migration):
@@ -40,7 +41,7 @@ class Migration(migrations.Migration):
(
'arguments', models.TextField(
blank=True, null=True, verbose_name='Arguments',
- validators=[converter.validators.YAMLValidator]
+ validators=[mayan.apps.converter.validators.YAMLValidator]
)
),
(
diff --git a/mayan/apps/converter/migrations/0003_auto_20150704_0731.py b/mayan/apps/converter/migrations/0003_auto_20150704_0731.py
index 0520d15479..bac515dc5d 100644
--- a/mayan/apps/converter/migrations/0003_auto_20150704_0731.py
+++ b/mayan/apps/converter/migrations/0003_auto_20150704_0731.py
@@ -2,7 +2,8 @@
from __future__ import unicode_literals
from django.db import models, migrations
-import converter.validators
+
+import mayan.apps.converter.validators
class Migration(migrations.Migration):
@@ -19,7 +20,7 @@ class Migration(migrations.Migration):
default='', help_text='Enter the arguments for the '
'transformation as a YAML dictionary. ie: {"degrees": 180}',
blank=True, verbose_name='Arguments', validators=[
- converter.validators.YAMLValidator
+ mayan.apps.converter.validators.YAMLValidator
]
),
preserve_default=False,
diff --git a/mayan/apps/converter/migrations/0004_auto_20150704_0753.py b/mayan/apps/converter/migrations/0004_auto_20150704_0753.py
index a5a45632ce..d3e5ef1927 100644
--- a/mayan/apps/converter/migrations/0004_auto_20150704_0753.py
+++ b/mayan/apps/converter/migrations/0004_auto_20150704_0753.py
@@ -2,7 +2,8 @@
from __future__ import unicode_literals
from django.db import models, migrations
-import converter.validators
+
+import mayan.apps.converter.validators
class Migration(migrations.Migration):
@@ -19,7 +20,7 @@ class Migration(migrations.Migration):
help_text='Enter the arguments for the transformation as a '
'YAML dictionary. ie: {"degrees": 180}',
blank=True, verbose_name='Arguments',
- validators=[converter.validators.YAMLValidator()]
+ validators=[mayan.apps.converter.validators.YAMLValidator()]
),
preserve_default=True,
),
diff --git a/mayan/apps/converter/migrations/0005_auto_20150708_0118.py b/mayan/apps/converter/migrations/0005_auto_20150708_0118.py
index 26a10ea051..afef03835b 100644
--- a/mayan/apps/converter/migrations/0005_auto_20150708_0118.py
+++ b/mayan/apps/converter/migrations/0005_auto_20150708_0118.py
@@ -2,7 +2,8 @@
from __future__ import unicode_literals
from django.db import models, migrations
-import converter.validators
+
+import mayan.apps.converter.validators
class Migration(migrations.Migration):
@@ -19,7 +20,7 @@ class Migration(migrations.Migration):
help_text='Enter the arguments for the transformation as a '
'YAML dictionary. ie: {"degrees": 180}', blank=True,
verbose_name='Arguments',
- validators=[converter.validators.YAMLValidator()]
+ validators=[mayan.apps.converter.validators.YAMLValidator()]
),
preserve_default=True,
),
diff --git a/mayan/apps/converter/migrations/0006_auto_20150708_0120.py b/mayan/apps/converter/migrations/0006_auto_20150708_0120.py
index 0d6b09961e..9620b8e0f2 100644
--- a/mayan/apps/converter/migrations/0006_auto_20150708_0120.py
+++ b/mayan/apps/converter/migrations/0006_auto_20150708_0120.py
@@ -2,7 +2,8 @@
from __future__ import unicode_literals
from django.db import models, migrations
-import converter.models
+
+import mayan.apps.converter.models
class Migration(migrations.Migration):
@@ -19,7 +20,7 @@ class Migration(migrations.Migration):
help_text='Enter the arguments for the transformation as a '
'YAML dictionary. ie: {"degrees": 180}', blank=True,
verbose_name='Arguments', validators=getattr(
- converter.models, 'validators', []
+ mayan.apps.converter.models, 'validators', []
)
),
preserve_default=True,
diff --git a/mayan/apps/converter/migrations/0007_auto_20150711_0656.py b/mayan/apps/converter/migrations/0007_auto_20150711_0656.py
index 6cbf947d5a..540661ad9e 100644
--- a/mayan/apps/converter/migrations/0007_auto_20150711_0656.py
+++ b/mayan/apps/converter/migrations/0007_auto_20150711_0656.py
@@ -2,7 +2,8 @@
from __future__ import unicode_literals
from django.db import models, migrations
-import converter.validators
+
+import mayan.apps.converter.validators
class Migration(migrations.Migration):
@@ -19,7 +20,7 @@ class Migration(migrations.Migration):
help_text='Enter the arguments for the transformation as a '
'YAML dictionary. ie: {"degrees": 180}', blank=True,
verbose_name='Arguments',
- validators=[converter.validators.YAMLValidator()]
+ validators=[mayan.apps.converter.validators.YAMLValidator()]
),
preserve_default=True,
),
diff --git a/mayan/apps/converter/permissions.py b/mayan/apps/converter/permissions.py
index 73d7ea86ba..cbb575a0e9 100644
--- a/mayan/apps/converter/permissions.py
+++ b/mayan/apps/converter/permissions.py
@@ -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('converter', _('Converter'))
diff --git a/mayan/apps/converter/settings.py b/mayan/apps/converter/settings.py
index 678b5de8b0..b75f8689d8 100644
--- a/mayan/apps/converter/settings.py
+++ b/mayan/apps/converter/settings.py
@@ -2,7 +2,7 @@ from __future__ import unicode_literals
from django.utils.translation import ugettext_lazy as _
-from smart_settings import Namespace
+from mayan.apps.smart_settings import Namespace
from .literals import (
DEFAULT_LIBREOFFICE_PATH, DEFAULT_PDFTOPPM_DPI, DEFAULT_PDFTOPPM_FORMAT,
@@ -11,7 +11,7 @@ from .literals import (
namespace = Namespace(name='converter', label=_('Converter'))
setting_graphics_backend = namespace.add_setting(
- default='converter.backends.python.Python',
+ default='mayan.apps.converter.backends.python.Python',
help_text=_('Graphics conversion backend to use.'),
global_name='CONVERTER_GRAPHICS_BACKEND',
)
diff --git a/mayan/apps/converter/tests/test_transformations.py b/mayan/apps/converter/tests/test_transformations.py
index 2773ea4108..0541708aba 100644
--- a/mayan/apps/converter/tests/test_transformations.py
+++ b/mayan/apps/converter/tests/test_transformations.py
@@ -2,7 +2,7 @@ from __future__ import unicode_literals
from django.test import TestCase
-from documents.tests import GenericDocumentTestCase
+from mayan.apps.documents.tests import GenericDocumentTestCase
from ..models import Transformation
from ..transformations import (
diff --git a/mayan/apps/converter/tests/test_views.py b/mayan/apps/converter/tests/test_views.py
index 4cea22811f..7a64166d6f 100644
--- a/mayan/apps/converter/tests/test_views.py
+++ b/mayan/apps/converter/tests/test_views.py
@@ -2,7 +2,7 @@ from __future__ import unicode_literals
from django.contrib.contenttypes.models import ContentType
-from documents.tests import GenericDocumentViewTestCase
+from mayan.apps.documents.tests import GenericDocumentViewTestCase
from ..models import Transformation
from ..permissions import (
diff --git a/mayan/apps/converter/views.py b/mayan/apps/converter/views.py
index f9af17a751..d1ec08c0a7 100644
--- a/mayan/apps/converter/views.py
+++ b/mayan/apps/converter/views.py
@@ -9,8 +9,8 @@ from django.template import RequestContext
from django.urls import reverse
from django.utils.translation import ugettext_lazy as _
-from acls.models import AccessControlList
-from common.views import (
+from mayan.apps.acls.models import AccessControlList
+from mayan.apps.common.views import (
SingleObjectCreateView, SingleObjectDeleteView, SingleObjectEditView,
SingleObjectListView
)
diff --git a/mayan/apps/django_gpg/__init__.py b/mayan/apps/django_gpg/__init__.py
index aaa35022cd..488c100370 100644
--- a/mayan/apps/django_gpg/__init__.py
+++ b/mayan/apps/django_gpg/__init__.py
@@ -1,3 +1,3 @@
from __future__ import unicode_literals
-default_app_config = 'django_gpg.apps.DjangoGPGApp'
+default_app_config = 'mayan.apps.django_gpg.apps.DjangoGPGApp'
diff --git a/mayan/apps/django_gpg/api_views.py b/mayan/apps/django_gpg/api_views.py
index 17a9a8f92e..47014873da 100644
--- a/mayan/apps/django_gpg/api_views.py
+++ b/mayan/apps/django_gpg/api_views.py
@@ -2,8 +2,8 @@ from __future__ import absolute_import, unicode_literals
from rest_framework import generics
-from rest_api.filters import MayanObjectPermissionsFilter
-from rest_api.permissions import MayanPermission
+from mayan.apps.rest_api.filters import MayanObjectPermissionsFilter
+from mayan.apps.rest_api.permissions import MayanPermission
from .models import Key
from .permissions import (
diff --git a/mayan/apps/django_gpg/apps.py b/mayan/apps/django_gpg/apps.py
index 065c3198cb..0362b64415 100644
--- a/mayan/apps/django_gpg/apps.py
+++ b/mayan/apps/django_gpg/apps.py
@@ -2,13 +2,13 @@ from __future__ import absolute_import, unicode_literals
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_object, menu_setup, menu_sidebar
)
-from navigation import SourceColumn
+from mayan.apps.navigation import SourceColumn
from .classes import KeyStub
from .links import (
@@ -24,10 +24,11 @@ from .permissions import (
class DjangoGPGApp(MayanAppConfig):
- app_url = 'gpg'
+ app_namespace = 'django_gpg'
+ app_url = 'keys'
has_rest_api = True
has_tests = True
- name = 'django_gpg'
+ name = 'mayan.apps.django_gpg'
verbose_name = _('Django GPG')
def ready(self):
diff --git a/mayan/apps/django_gpg/classes.py b/mayan/apps/django_gpg/classes.py
index 5dd69945f1..494fe86438 100644
--- a/mayan/apps/django_gpg/classes.py
+++ b/mayan/apps/django_gpg/classes.py
@@ -6,7 +6,7 @@ import shutil
import gnupg
-from common.utils import mkdtemp
+from mayan.apps.common.utils import mkdtemp
class GPGBackend(object):
diff --git a/mayan/apps/django_gpg/forms.py b/mayan/apps/django_gpg/forms.py
index a2d1235c9e..1d72806e93 100644
--- a/mayan/apps/django_gpg/forms.py
+++ b/mayan/apps/django_gpg/forms.py
@@ -4,7 +4,7 @@ from django import forms
from django.utils.html import escape
from django.utils.translation import ugettext_lazy as _
-from common.forms import DetailForm
+from mayan.apps.common.forms import DetailForm
from .models import Key
diff --git a/mayan/apps/django_gpg/icons.py b/mayan/apps/django_gpg/icons.py
index 99f7eb8a87..a1d08dc42e 100644
--- a/mayan/apps/django_gpg/icons.py
+++ b/mayan/apps/django_gpg/icons.py
@@ -1,6 +1,6 @@
from __future__ import absolute_import, unicode_literals
-from appearance.classes import Icon
+from mayan.apps.appearance.classes import Icon
icon_key_setup = Icon(driver_name='fontawesome', symbol='key')
icon_key_upload = Icon(driver_name='fontawesome', symbol='upload')
diff --git a/mayan/apps/django_gpg/licenses.py b/mayan/apps/django_gpg/licenses.py
index 48a271fec7..0cd755d7f9 100644
--- a/mayan/apps/django_gpg/licenses.py
+++ b/mayan/apps/django_gpg/licenses.py
@@ -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='python-gnupg', license_text='''
Copyright (c) 2008-2014 by Vinay Sajip.
diff --git a/mayan/apps/django_gpg/links.py b/mayan/apps/django_gpg/links.py
index 8b35b579d3..32eb85ff78 100644
--- a/mayan/apps/django_gpg/links.py
+++ b/mayan/apps/django_gpg/links.py
@@ -2,7 +2,7 @@ from __future__ import unicode_literals
from django.utils.translation import ugettext_lazy as _
-from navigation import Link
+from mayan.apps.navigation import Link
from .icons import icon_key_setup, icon_key_upload, icon_keyserver_search
from .permissions import (
diff --git a/mayan/apps/django_gpg/managers.py b/mayan/apps/django_gpg/managers.py
index 7dcaad166b..e6b498f32c 100644
--- a/mayan/apps/django_gpg/managers.py
+++ b/mayan/apps/django_gpg/managers.py
@@ -6,7 +6,7 @@ import os
from django.db import models
-from common.utils import mkstemp
+from mayan.apps.common.utils import mkstemp
from .classes import KeyStub, SignatureVerification
from .exceptions import (
diff --git a/mayan/apps/django_gpg/permissions.py b/mayan/apps/django_gpg/permissions.py
index 5e36afadb9..b6b1d14144 100644
--- a/mayan/apps/django_gpg/permissions.py
+++ b/mayan/apps/django_gpg/permissions.py
@@ -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('django_gpg', _('Key management'))
diff --git a/mayan/apps/django_gpg/runtime.py b/mayan/apps/django_gpg/runtime.py
index 0f4e57c449..250373f711 100644
--- a/mayan/apps/django_gpg/runtime.py
+++ b/mayan/apps/django_gpg/runtime.py
@@ -3,7 +3,7 @@ from django.utils.module_loading import import_string
from .settings import setting_gpg_path
# TODO: This will become an setting option in 2.2
-SETTING_GPG_BACKEND = 'django_gpg.classes.PythonGNUPGBackend'
+SETTING_GPG_BACKEND = 'mayan.apps.django_gpg.classes.PythonGNUPGBackend'
gpg_backend = import_string(SETTING_GPG_BACKEND)(
binary_path=setting_gpg_path.value
diff --git a/mayan/apps/django_gpg/settings.py b/mayan/apps/django_gpg/settings.py
index 8c49e0cc48..0f7aff18aa 100644
--- a/mayan/apps/django_gpg/settings.py
+++ b/mayan/apps/django_gpg/settings.py
@@ -5,7 +5,7 @@ import os
from django.conf import settings
from django.utils.translation import ugettext_lazy as _
-from smart_settings import Namespace
+from mayan.apps.smart_settings import Namespace
namespace = Namespace(name='django_gpg', label=_('Signatures'))
setting_gpg_home = namespace.add_setting(
diff --git a/mayan/apps/django_gpg/tests/test_api.py b/mayan/apps/django_gpg/tests/test_api.py
index e3aa6814e4..eebbf7e0a0 100644
--- a/mayan/apps/django_gpg/tests/test_api.py
+++ b/mayan/apps/django_gpg/tests/test_api.py
@@ -4,7 +4,7 @@ from django.test import override_settings
from rest_framework import status
-from rest_api.tests import BaseAPITestCase
+from mayan.apps.rest_api.tests import BaseAPITestCase
from ..models import Key
from ..permissions import (
diff --git a/mayan/apps/django_gpg/tests/test_models.py b/mayan/apps/django_gpg/tests/test_models.py
index 99261d9a5f..763166f905 100644
--- a/mayan/apps/django_gpg/tests/test_models.py
+++ b/mayan/apps/django_gpg/tests/test_models.py
@@ -7,8 +7,8 @@ import mock
from django.utils.encoding import force_bytes
-from common.tests import BaseTestCase
-from common.utils import TemporaryFile
+from mayan.apps.common.tests import BaseTestCase
+from mayan.apps.common.utils import TemporaryFile
from ..exceptions import (
DecryptionError, KeyDoesNotExist, NeedPassphrase, PassphraseError,
diff --git a/mayan/apps/django_gpg/tests/test_views.py b/mayan/apps/django_gpg/tests/test_views.py
index 51488cb5da..39cb0164be 100644
--- a/mayan/apps/django_gpg/tests/test_views.py
+++ b/mayan/apps/django_gpg/tests/test_views.py
@@ -2,7 +2,7 @@ from __future__ import absolute_import, unicode_literals
from django_downloadview.test import assert_download_response
-from common.tests import GenericViewTestCase
+from mayan.apps.common.tests import GenericViewTestCase
from ..models import Key
from ..permissions import permission_key_download, permission_key_upload
diff --git a/mayan/apps/django_gpg/views.py b/mayan/apps/django_gpg/views.py
index bff1d56635..54842cd3b1 100644
--- a/mayan/apps/django_gpg/views.py
+++ b/mayan/apps/django_gpg/views.py
@@ -8,7 +8,7 @@ from django.template import RequestContext
from django.urls import reverse, reverse_lazy
from django.utils.translation import ugettext_lazy as _
-from common.generics import (
+from mayan.apps.common.generics import (
ConfirmView, SingleObjectCreateView, SingleObjectDeleteView,
SingleObjectDetailView, SingleObjectDownloadView, SingleObjectListView,
SimpleView
diff --git a/mayan/apps/document_comments/__init__.py b/mayan/apps/document_comments/__init__.py
index b8cee85ba4..a48b77d7c9 100644
--- a/mayan/apps/document_comments/__init__.py
+++ b/mayan/apps/document_comments/__init__.py
@@ -1,3 +1,3 @@
from __future__ import unicode_literals
-default_app_config = 'document_comments.apps.DocumentCommentsApp'
+default_app_config = 'mayan.apps.document_comments.apps.DocumentCommentsApp'
diff --git a/mayan/apps/document_comments/api_views.py b/mayan/apps/document_comments/api_views.py
index 8994571d20..af7bec614f 100644
--- a/mayan/apps/document_comments/api_views.py
+++ b/mayan/apps/document_comments/api_views.py
@@ -4,8 +4,8 @@ from django.shortcuts import get_object_or_404
from rest_framework import generics
-from acls.models import AccessControlList
-from documents.models import Document
+from mayan.apps.acls.models import AccessControlList
+from mayan.apps.documents.models import Document
from .permissions import (
permission_comment_create, permission_comment_delete,
diff --git a/mayan/apps/document_comments/apps.py b/mayan/apps/document_comments/apps.py
index 37b683a5b9..5689c1225d 100644
--- a/mayan/apps/document_comments/apps.py
+++ b/mayan/apps/document_comments/apps.py
@@ -3,11 +3,11 @@ from __future__ import absolute_import, unicode_literals
from django.apps import apps
from django.utils.translation import ugettext_lazy as _
-from acls import ModelPermission
-from common import MayanAppConfig, menu_facet, menu_object, menu_sidebar
-from documents.search import document_page_search, document_search
-from events import ModelEventType
-from navigation import SourceColumn
+from mayan.apps.acls import ModelPermission
+from mayan.apps.common import MayanAppConfig, menu_facet, menu_object, menu_sidebar
+from mayan.apps.documents.search import document_page_search, document_search
+from mayan.apps.events import ModelEventType
+from mayan.apps.navigation import SourceColumn
from .events import (
event_document_comment_create, event_document_comment_delete
@@ -26,7 +26,7 @@ class DocumentCommentsApp(MayanAppConfig):
app_url = 'comments'
has_rest_api = True
has_tests = True
- name = 'document_comments'
+ name = 'mayan.apps.document_comments'
verbose_name = _('Document comments')
def ready(self):
diff --git a/mayan/apps/document_comments/events.py b/mayan/apps/document_comments/events.py
index 1876854d43..66cd211e5b 100644
--- a/mayan/apps/document_comments/events.py
+++ b/mayan/apps/document_comments/events.py
@@ -2,7 +2,7 @@ from __future__ import absolute_import, unicode_literals
from django.utils.translation import ugettext_lazy as _
-from events import EventTypeNamespace
+from mayan.apps.events import EventTypeNamespace
namespace = EventTypeNamespace(
name='document_comments', label=_('Document comments')
diff --git a/mayan/apps/document_comments/icons.py b/mayan/apps/document_comments/icons.py
index c0c4fbdc6e..db0a9d2d05 100644
--- a/mayan/apps/document_comments/icons.py
+++ b/mayan/apps/document_comments/icons.py
@@ -1,6 +1,6 @@
from __future__ import absolute_import, unicode_literals
-from appearance.classes import Icon
+from mayan.apps.appearance.classes import Icon
icon_comments_for_document = Icon(driver_name='fontawesome', symbol='comment')
icon_comment_add = Icon(driver_name='fontawesome', symbol='plus')
diff --git a/mayan/apps/document_comments/links.py b/mayan/apps/document_comments/links.py
index 5cf30707ba..48f1edb461 100644
--- a/mayan/apps/document_comments/links.py
+++ b/mayan/apps/document_comments/links.py
@@ -2,7 +2,7 @@ from __future__ import unicode_literals, absolute_import
from django.utils.translation import ugettext_lazy as _
-from navigation import Link
+from mayan.apps.navigation import Link
from .icons import icon_comment_add, icon_comments_for_document
from .permissions import (
diff --git a/mayan/apps/document_comments/models.py b/mayan/apps/document_comments/models.py
index 016591aae2..4f8919f41e 100644
--- a/mayan/apps/document_comments/models.py
+++ b/mayan/apps/document_comments/models.py
@@ -7,7 +7,7 @@ from django.db import models
from django.utils.encoding import python_2_unicode_compatible
from django.utils.translation import ugettext_lazy as _
-from documents.models import Document
+from mayan.apps.documents.models import Document
from .events import (
event_document_comment_create, event_document_comment_delete
diff --git a/mayan/apps/document_comments/permissions.py b/mayan/apps/document_comments/permissions.py
index 2a9fe8c1ac..cdd02aa14b 100644
--- a/mayan/apps/document_comments/permissions.py
+++ b/mayan/apps/document_comments/permissions.py
@@ -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('comments', _('Comments'))
diff --git a/mayan/apps/document_comments/serializers.py b/mayan/apps/document_comments/serializers.py
index 4090cdadfd..3521b1813b 100644
--- a/mayan/apps/document_comments/serializers.py
+++ b/mayan/apps/document_comments/serializers.py
@@ -3,8 +3,8 @@ from __future__ import unicode_literals
from rest_framework import serializers
from rest_framework.reverse import reverse
-from documents.serializers import DocumentSerializer
-from user_management.serializers import UserSerializer
+from mayan.apps.documents.serializers import DocumentSerializer
+from mayan.apps.user_management.serializers import UserSerializer
from .models import Comment
diff --git a/mayan/apps/document_comments/tests/test_api.py b/mayan/apps/document_comments/tests/test_api.py
index 96f44d93e5..0fba5c7269 100644
--- a/mayan/apps/document_comments/tests/test_api.py
+++ b/mayan/apps/document_comments/tests/test_api.py
@@ -4,8 +4,8 @@ from django.test import override_settings
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 Comment
from ..permissions import (
diff --git a/mayan/apps/document_comments/views.py b/mayan/apps/document_comments/views.py
index 5f53a5ba69..018bdfe0f6 100644
--- a/mayan/apps/document_comments/views.py
+++ b/mayan/apps/document_comments/views.py
@@ -5,11 +5,11 @@ from django.template import RequestContext
from django.urls import reverse
from django.utils.translation import ugettext_lazy as _
-from acls.models import AccessControlList
-from common.generics import (
+from mayan.apps.acls.models import AccessControlList
+from mayan.apps.common.generics import (
SingleObjectCreateView, SingleObjectDeleteView, SingleObjectListView
)
-from documents.models import Document
+from mayan.apps.documents.models import Document
from .icons import icon_comments_for_document
from .links import link_comment_add
diff --git a/mayan/apps/document_indexing/__init__.py b/mayan/apps/document_indexing/__init__.py
index 48a464f6e7..5bff793cbb 100644
--- a/mayan/apps/document_indexing/__init__.py
+++ b/mayan/apps/document_indexing/__init__.py
@@ -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'
diff --git a/mayan/apps/document_indexing/api_views.py b/mayan/apps/document_indexing/api_views.py
index 1dea00853e..cf0b41487a 100644
--- a/mayan/apps/document_indexing/api_views.py
+++ b/mayan/apps/document_indexing/api_views.py
@@ -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 (
diff --git a/mayan/apps/document_indexing/apps.py b/mayan/apps/document_indexing/apps.py
index 254d2f1b18..709bd35a89 100644
--- a/mayan/apps/document_indexing/apps.py
+++ b/mayan/apps/document_indexing/apps.py
@@ -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'
},
}
diff --git a/mayan/apps/document_indexing/forms.py b/mayan/apps/document_indexing/forms.py
index dd558ed0d1..26ddd8f434 100644
--- a/mayan/apps/document_indexing/forms.py
+++ b/mayan/apps/document_indexing/forms.py
@@ -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
diff --git a/mayan/apps/document_indexing/icons.py b/mayan/apps/document_indexing/icons.py
index 0f27b10ebc..ac7d0586db 100644
--- a/mayan/apps/document_indexing/icons.py
+++ b/mayan/apps/document_indexing/icons.py
@@ -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(
diff --git a/mayan/apps/document_indexing/licenses.py b/mayan/apps/document_indexing/licenses.py
index 2c981908d2..b81d0e4d08 100644
--- a/mayan/apps/document_indexing/licenses.py
+++ b/mayan/apps/document_indexing/licenses.py
@@ -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
diff --git a/mayan/apps/document_indexing/links.py b/mayan/apps/document_indexing/links.py
index 42e3b94d6d..62aea68467 100644
--- a/mayan/apps/document_indexing/links.py
+++ b/mayan/apps/document_indexing/links.py
@@ -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,
diff --git a/mayan/apps/document_indexing/models.py b/mayan/apps/document_indexing/models.py
index 528d92e1ca..bcf105eae0 100644
--- a/mayan/apps/document_indexing/models.py
+++ b/mayan/apps/document_indexing/models.py
@@ -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
diff --git a/mayan/apps/document_indexing/permissions.py b/mayan/apps/document_indexing/permissions.py
index c29a219e49..f907bf6e13 100644
--- a/mayan/apps/document_indexing/permissions.py
+++ b/mayan/apps/document_indexing/permissions.py
@@ -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'))
diff --git a/mayan/apps/document_indexing/queues.py b/mayan/apps/document_indexing/queues.py
index 50da37e06a..96347ba0ef 100644
--- a/mayan/apps/document_indexing/queues.py
+++ b/mayan/apps/document_indexing/queues.py
@@ -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')
)
diff --git a/mayan/apps/document_indexing/tasks.py b/mayan/apps/document_indexing/tasks.py
index e6e4f04033..506c6e243b 100644
--- a/mayan/apps/document_indexing/tasks.py
+++ b/mayan/apps/document_indexing/tasks.py
@@ -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
diff --git a/mayan/apps/document_indexing/tests/test_api.py b/mayan/apps/document_indexing/tests/test_api.py
index 9127ce497e..5f780cb015 100644
--- a/mayan/apps/document_indexing/tests/test_api.py
+++ b/mayan/apps/document_indexing/tests/test_api.py
@@ -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 (
diff --git a/mayan/apps/document_indexing/tests/test_models.py b/mayan/apps/document_indexing/tests/test_models.py
index 6a508ab45b..320742f5c1 100644
--- a/mayan/apps/document_indexing/tests/test_models.py
+++ b/mayan/apps/document_indexing/tests/test_models.py
@@ -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
diff --git a/mayan/apps/document_indexing/tests/test_views.py b/mayan/apps/document_indexing/tests/test_views.py
index 5e4b1015ad..4efdeb86e8 100644
--- a/mayan/apps/document_indexing/tests/test_views.py
+++ b/mayan/apps/document_indexing/tests/test_views.py
@@ -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 (
diff --git a/mayan/apps/document_indexing/views.py b/mayan/apps/document_indexing/views.py
index 7cbdb92e93..50e9c8fdeb 100644
--- a/mayan/apps/document_indexing/views.py
+++ b/mayan/apps/document_indexing/views.py
@@ -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
diff --git a/mayan/apps/document_indexing/widgets.py b/mayan/apps/document_indexing/widgets.py
index 35e6763034..da2fb21c5d 100644
--- a/mayan/apps/document_indexing/widgets.py
+++ b/mayan/apps/document_indexing/widgets.py
@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-
from __future__ import unicode_literals
from django.apps import apps
diff --git a/mayan/apps/document_parsing/__init__.py b/mayan/apps/document_parsing/__init__.py
index 79c2287b15..0a3b36c29d 100644
--- a/mayan/apps/document_parsing/__init__.py
+++ b/mayan/apps/document_parsing/__init__.py
@@ -1,3 +1,3 @@
from __future__ import unicode_literals
-default_app_config = 'document_parsing.apps.DocumentParsingApp'
+default_app_config = 'mayan.apps.document_parsing.apps.DocumentParsingApp'
diff --git a/mayan/apps/document_parsing/api_views.py b/mayan/apps/document_parsing/api_views.py
index cecf57f1c2..212ace6b09 100644
--- a/mayan/apps/document_parsing/api_views.py
+++ b/mayan/apps/document_parsing/api_views.py
@@ -5,8 +5,8 @@ from django.shortcuts import get_object_or_404
from rest_framework import generics
from rest_framework.response import Response
-from documents.models import Document
-from rest_api.permissions import MayanPermission
+from mayan.apps.documents.models import Document
+from mayan.apps.rest_api.permissions import MayanPermission
from .models import DocumentPageContent
from .permissions import permission_content_view
diff --git a/mayan/apps/document_parsing/apps.py b/mayan/apps/document_parsing/apps.py
index c410ba2237..8cfcda480e 100644
--- a/mayan/apps/document_parsing/apps.py
+++ b/mayan/apps/document_parsing/apps.py
@@ -10,18 +10,18 @@ from django.db.models.signals import post_save
from django.utils.timezone import now
from django.utils.translation import ugettext_lazy as _
-from acls import ModelPermission
-from common import (
+from mayan.apps.acls import ModelPermission
+from mayan.apps.common import (
MayanAppConfig, menu_facet, menu_multi_item, menu_object, menu_secondary,
menu_tools
)
-from common.classes import ModelField
-from common.settings import settings_db_sync_task_delay
-from documents.search import document_search, document_page_search
-from documents.signals import post_version_upload
-from documents.widgets import document_link
+from mayan.apps.common.classes import ModelField
+from mayan.apps.common.settings import settings_db_sync_task_delay
+from mayan.apps.documents.search import document_search, document_page_search
+from mayan.apps.documents.signals import post_version_upload
+from mayan.apps.documents.widgets import document_link
+from mayan.apps.navigation import SourceColumn
from mayan.celery import app
-from navigation import SourceColumn
from .events import event_parsing_document_version_submit
from .handlers import (
@@ -66,9 +66,11 @@ def document_version_parsing_submit(self):
class DocumentParsingApp(MayanAppConfig):
+ app_namespace = 'document_parsing'
+ app_url = 'parsing'
has_rest_api = True
has_tests = True
- name = 'document_parsing'
+ name = 'mayan.apps.document_parsing'
verbose_name = _('Document parsing')
def ready(self):
@@ -141,7 +143,7 @@ class DocumentParsingApp(MayanAppConfig):
app.conf.CELERY_ROUTES.update(
{
- 'document_parsing.tasks.task_parse_document_version': {
+ 'mayan.apps.document_parsing.tasks.task_parse_document_version': {
'queue': 'parsing'
},
}
diff --git a/mayan/apps/document_parsing/events.py b/mayan/apps/document_parsing/events.py
index 2c90d72aae..84a9c86d6d 100644
--- a/mayan/apps/document_parsing/events.py
+++ b/mayan/apps/document_parsing/events.py
@@ -2,7 +2,7 @@ from __future__ import absolute_import, unicode_literals
from django.utils.translation import ugettext_lazy as _
-from events import EventTypeNamespace
+from mayan.apps.events import EventTypeNamespace
namespace = EventTypeNamespace(
name='document_parsing', label=_('Document parsing')
diff --git a/mayan/apps/document_parsing/forms.py b/mayan/apps/document_parsing/forms.py
index 5c732a6bcc..500cfeb160 100644
--- a/mayan/apps/document_parsing/forms.py
+++ b/mayan/apps/document_parsing/forms.py
@@ -6,9 +6,9 @@ from django.utils.html import conditional_escape
from django.utils.safestring import mark_safe
from django.utils.translation import ugettext_lazy as _, ugettext
-from acls.models import AccessControlList
-from common.widgets import TextAreaDiv
-from documents.models import DocumentType
+from mayan.apps.acls.models import AccessControlList
+from mayan.apps.common.widgets import TextAreaDiv
+from mayan.apps.documents.models import DocumentType
from .models import DocumentPageContent
from .permissions import permission_parse_document
diff --git a/mayan/apps/document_parsing/handlers.py b/mayan/apps/document_parsing/handlers.py
index f294a9ae1a..8d01941986 100644
--- a/mayan/apps/document_parsing/handlers.py
+++ b/mayan/apps/document_parsing/handlers.py
@@ -4,7 +4,7 @@ import logging
from django.apps import apps
-from document_indexing.tasks import task_index_document
+from mayan.apps.document_indexing.tasks import task_index_document
from .settings import setting_auto_parsing
diff --git a/mayan/apps/document_parsing/icons.py b/mayan/apps/document_parsing/icons.py
index 4bbadfaa6d..85e78ea2ad 100644
--- a/mayan/apps/document_parsing/icons.py
+++ b/mayan/apps/document_parsing/icons.py
@@ -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_content = Icon(driver_name='fontawesome', symbol='font')
icon_document_parsing_errors_list = Icon(
diff --git a/mayan/apps/document_parsing/links.py b/mayan/apps/document_parsing/links.py
index 92f8ab9ba6..865d26c8e0 100644
--- a/mayan/apps/document_parsing/links.py
+++ b/mayan/apps/document_parsing/links.py
@@ -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_content, icon_document_parsing_errors_list,
diff --git a/mayan/apps/document_parsing/models.py b/mayan/apps/document_parsing/models.py
index 066bc4996d..8b363c1df1 100644
--- a/mayan/apps/document_parsing/models.py
+++ b/mayan/apps/document_parsing/models.py
@@ -4,7 +4,9 @@ from django.db import models
from django.utils.encoding import force_text, python_2_unicode_compatible
from django.utils.translation import ugettext_lazy as _
-from documents.models import DocumentPage, DocumentType, DocumentVersion
+from mayan.apps.documents.models import (
+ DocumentPage, DocumentType, DocumentVersion
+)
from .managers import DocumentPageContentManager, DocumentTypeSettingsManager
diff --git a/mayan/apps/document_parsing/parsers.py b/mayan/apps/document_parsing/parsers.py
index ed693f66b3..fd70926255 100644
--- a/mayan/apps/document_parsing/parsers.py
+++ b/mayan/apps/document_parsing/parsers.py
@@ -7,7 +7,7 @@ import subprocess
from django.apps import apps
from django.utils.translation import ugettext_lazy as _
-from common.utils import copyfile, fs_cleanup, mkstemp
+from mayan.apps.common.utils import copyfile, fs_cleanup, mkstemp
from .exceptions import ParserError
from .settings import setting_pdftotext_path
diff --git a/mayan/apps/document_parsing/permissions.py b/mayan/apps/document_parsing/permissions.py
index 0ba6382b88..5ae8c03744 100644
--- a/mayan/apps/document_parsing/permissions.py
+++ b/mayan/apps/document_parsing/permissions.py
@@ -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_parsing', _('Document parsing'))
diff --git a/mayan/apps/document_parsing/queues.py b/mayan/apps/document_parsing/queues.py
index 42036d2420..8fa72c2cc4 100644
--- a/mayan/apps/document_parsing/queues.py
+++ b/mayan/apps/document_parsing/queues.py
@@ -2,10 +2,10 @@ from __future__ import unicode_literals
from django.utils.translation import ugettext_lazy as _
-from task_manager.classes import CeleryQueue
+from mayan.apps.task_manager.classes import CeleryQueue
queue_ocr = CeleryQueue(name='parsing', label=_('Parsing'))
queue_ocr.add_task_type(
- name='document_parsing.tasks.task_parse_document_version',
+ name='mayan.apps.document_parsing.tasks.task_parse_document_version',
label=_('Document version parsing')
)
diff --git a/mayan/apps/document_parsing/settings.py b/mayan/apps/document_parsing/settings.py
index 5f140ae800..1e9dd9f368 100644
--- a/mayan/apps/document_parsing/settings.py
+++ b/mayan/apps/document_parsing/settings.py
@@ -2,7 +2,7 @@ from __future__ import unicode_literals
from django.utils.translation import ugettext_lazy as _
-from smart_settings import Namespace
+from mayan.apps.smart_settings import Namespace
namespace = Namespace(name='document_parsing', label=_('Document parsing'))
diff --git a/mayan/apps/document_parsing/tests/test_api.py b/mayan/apps/document_parsing/tests/test_api.py
index 669154840e..7147f5de62 100644
--- a/mayan/apps/document_parsing/tests/test_api.py
+++ b/mayan/apps/document_parsing/tests/test_api.py
@@ -4,8 +4,8 @@ from django.test import override_settings
from rest_framework import status
-from documents.tests import DocumentTestMixin, TEST_HYBRID_DOCUMENT
-from rest_api.tests import BaseAPITestCase
+from mayan.apps.documents.tests import DocumentTestMixin, TEST_HYBRID_DOCUMENT
+from mayan.apps.rest_api.tests import BaseAPITestCase
from ..permissions import permission_content_view
diff --git a/mayan/apps/document_parsing/tests/test_events.py b/mayan/apps/document_parsing/tests/test_events.py
index b68db7a558..a4f7aa8d3b 100644
--- a/mayan/apps/document_parsing/tests/test_events.py
+++ b/mayan/apps/document_parsing/tests/test_events.py
@@ -2,8 +2,8 @@ from __future__ import unicode_literals
from actstream.models import Action
-from documents.tests.literals import TEST_DOCUMENT_FILENAME
-from documents.tests.test_models import GenericDocumentTestCase
+from mayan.apps.documents.tests.literals import TEST_DOCUMENT_FILENAME
+from mayan.apps.documents.tests.test_models import GenericDocumentTestCase
from ..events import (
event_parsing_document_version_submit,
diff --git a/mayan/apps/document_parsing/tests/test_indexing.py b/mayan/apps/document_parsing/tests/test_indexing.py
index d6a3d611b9..e40e78180a 100644
--- a/mayan/apps/document_parsing/tests/test_indexing.py
+++ b/mayan/apps/document_parsing/tests/test_indexing.py
@@ -2,11 +2,10 @@ from __future__ import unicode_literals
from django.test import override_settings
-from common.tests import BaseTestCase
-from documents.tests import DocumentTestMixin, TEST_HYBRID_DOCUMENT
-
-from document_indexing.models import Index, IndexInstanceNode
-from document_indexing.tests.literals import TEST_INDEX_LABEL
+from mayan.apps.common.tests import BaseTestCase
+from mayan.apps.documents.tests import DocumentTestMixin, TEST_HYBRID_DOCUMENT
+from mayan.apps.document_indexing.models import Index, IndexInstanceNode
+from mayan.apps.document_indexing.tests.literals import TEST_INDEX_LABEL
from .literals import TEST_PARSING_INDEX_NODE_TEMPLATE
diff --git a/mayan/apps/document_parsing/tests/test_models.py b/mayan/apps/document_parsing/tests/test_models.py
index 906ba9c9c7..1066119f67 100644
--- a/mayan/apps/document_parsing/tests/test_models.py
+++ b/mayan/apps/document_parsing/tests/test_models.py
@@ -2,7 +2,7 @@ from __future__ import unicode_literals
from django.test import override_settings
-from documents.tests import GenericDocumentTestCase, TEST_HYBRID_DOCUMENT
+from mayan.apps.documents.tests import GenericDocumentTestCase, TEST_HYBRID_DOCUMENT
TEST_DOCUMENT_CONTENT = 'Sample text'
diff --git a/mayan/apps/document_parsing/tests/test_parsers.py b/mayan/apps/document_parsing/tests/test_parsers.py
index 28d9a3bed4..cde12dde97 100644
--- a/mayan/apps/document_parsing/tests/test_parsers.py
+++ b/mayan/apps/document_parsing/tests/test_parsers.py
@@ -2,8 +2,8 @@ from __future__ import unicode_literals
from django.test import override_settings
-from common.tests import BaseTestCase
-from documents.tests import DocumentTestMixin, TEST_HYBRID_DOCUMENT
+from mayan.apps.common.tests import BaseTestCase
+from mayan.apps.documents.tests import DocumentTestMixin, TEST_HYBRID_DOCUMENT
from ..parsers import PopplerParser
diff --git a/mayan/apps/document_parsing/tests/test_views.py b/mayan/apps/document_parsing/tests/test_views.py
index 893df0cd71..bec1550bba 100644
--- a/mayan/apps/document_parsing/tests/test_views.py
+++ b/mayan/apps/document_parsing/tests/test_views.py
@@ -2,7 +2,9 @@ from __future__ import unicode_literals
from django.test import override_settings
-from documents.tests import GenericDocumentViewTestCase, TEST_HYBRID_DOCUMENT
+from mayan.apps.documents.tests import (
+ GenericDocumentViewTestCase, TEST_HYBRID_DOCUMENT
+)
from ..permissions import (
permission_content_view, permission_document_type_parsing_setup
diff --git a/mayan/apps/document_parsing/views.py b/mayan/apps/document_parsing/views.py
index d49ebb74ca..9ed149e018 100644
--- a/mayan/apps/document_parsing/views.py
+++ b/mayan/apps/document_parsing/views.py
@@ -6,11 +6,11 @@ from django.shortcuts import get_object_or_404
from django.urls import reverse, reverse_lazy
from django.utils.translation import ugettext_lazy as _, ungettext
-from common.generics import (
+from mayan.apps.common.generics import (
FormView, MultipleObjectConfirmActionView, SingleObjectDetailView,
SingleObjectDownloadView, SingleObjectEditView, SingleObjectListView
)
-from documents.models import Document, DocumentPage, DocumentType
+from mayan.apps.documents.models import Document, DocumentPage, DocumentType
from .forms import (
DocumentContentForm, DocumentPageContentForm, DocumentTypeSelectForm
diff --git a/mayan/apps/document_signatures/__init__.py b/mayan/apps/document_signatures/__init__.py
index eaddbbf26a..0654d4133a 100644
--- a/mayan/apps/document_signatures/__init__.py
+++ b/mayan/apps/document_signatures/__init__.py
@@ -1,3 +1,3 @@
from __future__ import unicode_literals
-default_app_config = 'document_signatures.apps.DocumentSignaturesApp'
+default_app_config = 'mayan.apps.document_signatures.apps.DocumentSignaturesApp'
diff --git a/mayan/apps/document_signatures/apps.py b/mayan/apps/document_signatures/apps.py
index c1714390c2..032573a747 100644
--- a/mayan/apps/document_signatures/apps.py
+++ b/mayan/apps/document_signatures/apps.py
@@ -8,12 +8,12 @@ from django.apps import apps
from django.db.models.signals import post_save, post_delete
from django.utils.translation import ugettext_lazy as _
-from acls import ModelPermission
-from common import (
+from mayan.apps.acls import ModelPermission
+from mayan.apps.common import (
MayanAppConfig, menu_facet, menu_object, menu_sidebar, menu_tools
)
+from mayan.apps.navigation import SourceColumn
from mayan.celery import app
-from navigation import SourceColumn
from .handlers import unverify_key_signatures, verify_key_signatures
from .links import (
@@ -44,7 +44,7 @@ class DocumentSignaturesApp(MayanAppConfig):
app_namespace = 'signatures'
app_url = 'signatures'
has_tests = True
- name = 'document_signatures'
+ name = 'mayan.apps.document_signatures'
verbose_name = _('Document signatures')
def ready(self):
@@ -110,16 +110,16 @@ class DocumentSignaturesApp(MayanAppConfig):
app.conf.CELERY_ROUTES.update(
{
- 'document_signatures.tasks.task_verify_key_signatures': {
+ 'mayan.apps.document_signatures.tasks.task_verify_key_signatures': {
'queue': 'signatures'
},
- 'document_signatures.tasks.task_unverify_key_signatures': {
+ 'mayan.apps.document_signatures.tasks.task_unverify_key_signatures': {
'queue': 'signatures'
},
- 'document_signatures.tasks.task_verify_document_version': {
+ 'mayan.apps.document_signatures.tasks.task_verify_document_version': {
'queue': 'signatures'
},
- 'document_signatures.tasks.task_verify_missing_embedded_signature': {
+ 'mayan.apps.document_signatures.tasks.task_verify_missing_embedded_signature': {
'queue': 'tools'
},
}
diff --git a/mayan/apps/document_signatures/forms.py b/mayan/apps/document_signatures/forms.py
index d5347bf20f..e0403a23c9 100644
--- a/mayan/apps/document_signatures/forms.py
+++ b/mayan/apps/document_signatures/forms.py
@@ -5,11 +5,10 @@ import logging
from django import forms
from django.utils.translation import ugettext_lazy as _
-from acls.models import AccessControlList
-
-from common.forms import DetailForm
-from django_gpg.models import Key
-from django_gpg.permissions import permission_key_sign
+from mayan.apps.acls.models import AccessControlList
+from mayan.apps.common.forms import DetailForm
+from mayan.apps.django_gpg.models import Key
+from mayan.apps.django_gpg.permissions import permission_key_sign
from .models import SignatureBaseModel
diff --git a/mayan/apps/document_signatures/icons.py b/mayan/apps/document_signatures/icons.py
index 72ab520830..9e61eb1a25 100644
--- a/mayan/apps/document_signatures/icons.py
+++ b/mayan/apps/document_signatures/icons.py
@@ -1,6 +1,6 @@
from __future__ import absolute_import, unicode_literals
-from appearance.classes import Icon
+from mayan.apps.appearance.classes import Icon
icon_all_document_version_signature_verify = Icon(
driver_name='fontawesome', symbol='certificate'
diff --git a/mayan/apps/document_signatures/links.py b/mayan/apps/document_signatures/links.py
index 562c65ebe4..8700766a19 100644
--- a/mayan/apps/document_signatures/links.py
+++ b/mayan/apps/document_signatures/links.py
@@ -3,7 +3,7 @@ from __future__ import unicode_literals
from django.apps import apps
from django.utils.translation import ugettext_lazy as _
-from navigation import Link
+from mayan.apps.navigation import Link
from .icons import (
icon_all_document_version_signature_verify, icon_document_signature_list,
diff --git a/mayan/apps/document_signatures/managers.py b/mayan/apps/document_signatures/managers.py
index edebf7c763..0425fa7d18 100644
--- a/mayan/apps/document_signatures/managers.py
+++ b/mayan/apps/document_signatures/managers.py
@@ -5,10 +5,10 @@ import os
from django.db import models
-from common.utils import mkstemp
-from django_gpg.exceptions import DecryptionError
-from django_gpg.models import Key
-from documents.models import DocumentVersion
+from mayan.apps.common.utils import mkstemp
+from mayan.apps.django_gpg.exceptions import DecryptionError
+from mayan.apps.django_gpg.models import Key
+from mayan.apps.documents.models import DocumentVersion
logger = logging.getLogger(__name__)
diff --git a/mayan/apps/document_signatures/migrations/0001_initial.py b/mayan/apps/document_signatures/migrations/0001_initial.py
index 8b36b5371a..9b78380944 100644
--- a/mayan/apps/document_signatures/migrations/0001_initial.py
+++ b/mayan/apps/document_signatures/migrations/0001_initial.py
@@ -4,7 +4,7 @@ from __future__ import unicode_literals
from django.db import models, migrations
from django.core.files.storage import FileSystemStorage
-import document_signatures.models
+import mayan.apps.document_signatures.models
class Migration(migrations.Migration):
@@ -26,7 +26,7 @@ class Migration(migrations.Migration):
(
'signature_file', models.FileField(
storage=FileSystemStorage(),
- upload_to=document_signatures.models.upload_to,
+ upload_to=mayan.apps.document_signatures.models.upload_to,
blank=True, editable=False, null=True,
verbose_name='Signature file'
)
diff --git a/mayan/apps/document_signatures/migrations/0002_auto_20150608_1902.py b/mayan/apps/document_signatures/migrations/0002_auto_20150608_1902.py
index bf631d8ebe..4fd69b1b45 100644
--- a/mayan/apps/document_signatures/migrations/0002_auto_20150608_1902.py
+++ b/mayan/apps/document_signatures/migrations/0002_auto_20150608_1902.py
@@ -4,7 +4,7 @@ from __future__ import unicode_literals
from django.db import models, migrations
from django.core.files.storage import FileSystemStorage
-import document_signatures.models
+import mayan.apps.document_signatures.models
class Migration(migrations.Migration):
@@ -27,7 +27,7 @@ class Migration(migrations.Migration):
name='signature_file',
field=models.FileField(
storage=FileSystemStorage(),
- upload_to=document_signatures.models.upload_to, null=True,
+ upload_to=mayan.apps.document_signatures.models.upload_to, null=True,
verbose_name='Signature file', blank=True
),
preserve_default=True,
diff --git a/mayan/apps/document_signatures/migrations/0003_auto_20160325_0052.py b/mayan/apps/document_signatures/migrations/0003_auto_20160325_0052.py
index 9a16e22525..737276a07c 100644
--- a/mayan/apps/document_signatures/migrations/0003_auto_20160325_0052.py
+++ b/mayan/apps/document_signatures/migrations/0003_auto_20160325_0052.py
@@ -4,7 +4,7 @@ from __future__ import unicode_literals
from django.db import migrations, models
from django.core.files.storage import FileSystemStorage
-import document_signatures.models
+import mayan.apps.document_signatures.models
class Migration(migrations.Migration):
@@ -92,7 +92,7 @@ class Migration(migrations.Migration):
(
'signature_file', models.FileField(
storage=FileSystemStorage(),
- upload_to=document_signatures.models.upload_to,
+ upload_to=mayan.apps.document_signatures.models.upload_to,
null=True, verbose_name='Signature file', blank=True
)
),
diff --git a/mayan/apps/document_signatures/migrations/0004_auto_20160325_0418.py b/mayan/apps/document_signatures/migrations/0004_auto_20160325_0418.py
index 8cbbd1c419..439eca806e 100644
--- a/mayan/apps/document_signatures/migrations/0004_auto_20160325_0418.py
+++ b/mayan/apps/document_signatures/migrations/0004_auto_20160325_0418.py
@@ -15,7 +15,7 @@ class Migration(migrations.Migration):
model_name='documentversionsignature',
name='document_version',
field=models.ForeignKey(
- editable=False, to='documents.DocumentVersion',
+ editable=False, to='mayan.apps.documents.DocumentVersion',
verbose_name='Document version'
),
),
@@ -32,7 +32,7 @@ class Migration(migrations.Migration):
name='document_version',
field=models.ForeignKey(
related_name='signatures', editable=False,
- to='documents.DocumentVersion', verbose_name='Document version'
+ to='mayan.apps.documents.DocumentVersion', verbose_name='Document version'
),
),
migrations.AlterField(
diff --git a/mayan/apps/document_signatures/migrations/0007_auto_20180403_0702.py b/mayan/apps/document_signatures/migrations/0007_auto_20180403_0702.py
index f6f0463755..f822e966bd 100644
--- a/mayan/apps/document_signatures/migrations/0007_auto_20180403_0702.py
+++ b/mayan/apps/document_signatures/migrations/0007_auto_20180403_0702.py
@@ -4,7 +4,8 @@ from __future__ import unicode_literals
import django.core.files.storage
from django.db import migrations, models
-import document_signatures.models
+
+import mayan.apps.document_signatures.models
class Migration(migrations.Migration):
@@ -17,6 +18,6 @@ class Migration(migrations.Migration):
migrations.AlterField(
model_name='detachedsignature',
name='signature_file',
- field=models.FileField(blank=True, null=True, storage=django.core.files.storage.FileSystemStorage(location=b'mayan/media/document_storage'), upload_to=document_signatures.models.upload_to, verbose_name='Signature file'),
+ field=models.FileField(blank=True, null=True, storage=django.core.files.storage.FileSystemStorage(location=b'mayan/media/document_storage'), upload_to=mayan.apps.document_signatures.models.upload_to, verbose_name='Signature file'),
),
]
diff --git a/mayan/apps/document_signatures/migrations/0008_auto_20180429_0759.py b/mayan/apps/document_signatures/migrations/0008_auto_20180429_0759.py
index 02d5bf140b..ff48b34be2 100644
--- a/mayan/apps/document_signatures/migrations/0008_auto_20180429_0759.py
+++ b/mayan/apps/document_signatures/migrations/0008_auto_20180429_0759.py
@@ -4,7 +4,8 @@ from __future__ import unicode_literals
import django.core.files.storage
from django.db import migrations, models
-import document_signatures.models
+
+import mayan.apps.document_signatures.models
class Migration(migrations.Migration):
@@ -17,6 +18,11 @@ class Migration(migrations.Migration):
migrations.AlterField(
model_name='detachedsignature',
name='signature_file',
- field=models.FileField(blank=True, null=True, storage=django.core.files.storage.FileSystemStorage(location=b'/home/rosarior/development/mayan-edms/mayan/media/document_signatures'), upload_to=document_signatures.models.upload_to, verbose_name='Signature file'),
+ field=models.FileField(
+ blank=True, null=True, storage=django.core.files.storage.FileSystemStorage(
+ location=b'/home/rosarior/development/mayan-edms/mayan/media/document_signatures'
+ ),
+ upload_to=mayan.apps.document_signatures.models.upload_to, verbose_name='Signature file'
+ ),
),
]
diff --git a/mayan/apps/document_signatures/models.py b/mayan/apps/document_signatures/models.py
index f3409d35db..47e226f5ed 100644
--- a/mayan/apps/document_signatures/models.py
+++ b/mayan/apps/document_signatures/models.py
@@ -10,9 +10,9 @@ from django.utils.translation import ugettext_lazy as _
from model_utils.managers import InheritanceManager
-from django_gpg.exceptions import VerificationError
-from django_gpg.models import Key
-from documents.models import DocumentVersion
+from mayan.apps.django_gpg.exceptions import VerificationError
+from mayan.apps.django_gpg.models import Key
+from mayan.apps.documents.models import DocumentVersion
from .managers import EmbeddedSignatureManager
from .storages import storage_detachedsignature
diff --git a/mayan/apps/document_signatures/permissions.py b/mayan/apps/document_signatures/permissions.py
index c9bdbe684c..4e8d5cd770 100644
--- a/mayan/apps/document_signatures/permissions.py
+++ b/mayan/apps/document_signatures/permissions.py
@@ -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_signatures', _('Document signatures')
diff --git a/mayan/apps/document_signatures/queues.py b/mayan/apps/document_signatures/queues.py
index 72614fe449..50f431d401 100644
--- a/mayan/apps/document_signatures/queues.py
+++ b/mayan/apps/document_signatures/queues.py
@@ -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_signatures = CeleryQueue(name='signatures', label=_('Signatures'))
queue_signatures.add_task_type(
- name='document_signatures.tasks.task_verify_key_signatures',
+ name='mayan.apps.document_signatures.tasks.task_verify_key_signatures',
label=_('Verify key signatures')
)
queue_signatures.add_task_type(
- name='document_signatures.tasks.task_unverify_key_signatures',
+ name='mayan.apps.document_signatures.tasks.task_unverify_key_signatures',
label=_('Unverify key signatures')
)
queue_signatures.add_task_type(
- name='document_signatures.tasks.task_verify_document_version',
+ name='mayan.apps.document_signatures.tasks.task_verify_document_version',
label=_('Verify document version')
)
queue_tools.add_task_type(
- name='document_signatures.tasks.task_verify_missing_embedded_signature',
+ name='mayan.apps.document_signatures.tasks.task_verify_missing_embedded_signature',
label=_('Verify missing embedded signature')
)
diff --git a/mayan/apps/document_signatures/settings.py b/mayan/apps/document_signatures/settings.py
index 7b537a3dcd..3c61f5a916 100644
--- a/mayan/apps/document_signatures/settings.py
+++ b/mayan/apps/document_signatures/settings.py
@@ -5,7 +5,7 @@ import os
from django.conf import settings
from django.utils.translation import ugettext_lazy as _
-from smart_settings import Namespace
+from mayan.apps.smart_settings import Namespace
namespace = Namespace(name='signatures', label=_('Document signatures'))
setting_storage_backend = namespace.add_setting(
diff --git a/mayan/apps/document_signatures/tests/test_links.py b/mayan/apps/document_signatures/tests/test_links.py
index e6c9c5ce94..77d6d90cb9 100644
--- a/mayan/apps/document_signatures/tests/test_links.py
+++ b/mayan/apps/document_signatures/tests/test_links.py
@@ -3,7 +3,7 @@ from __future__ import unicode_literals
from django.core.files import File
from django.urls import reverse
-from documents.tests import (
+from mayan.apps.documents.tests import (
GenericDocumentViewTestCase, TEST_DOCUMENT_PATH
)
diff --git a/mayan/apps/document_signatures/tests/test_models.py b/mayan/apps/document_signatures/tests/test_models.py
index 42aa9d7586..2113397882 100644
--- a/mayan/apps/document_signatures/tests/test_models.py
+++ b/mayan/apps/document_signatures/tests/test_models.py
@@ -7,11 +7,13 @@ import time
from django.core.files import File
from django.test import override_settings
-from common.tests import BaseTestCase
-from django_gpg.models import Key
-from django_gpg.tests.literals import TEST_KEY_DATA, TEST_KEY_PASSPHRASE
-from documents.models import DocumentType, DocumentVersion
-from documents.tests import TEST_DOCUMENT_PATH, TEST_DOCUMENT_TYPE_LABEL
+from mayan.apps.common.tests import BaseTestCase
+from mayan.apps.django_gpg.models import Key
+from mayan.apps.django_gpg.tests.literals import (
+ TEST_KEY_DATA, TEST_KEY_PASSPHRASE
+)
+from mayan.apps.documents.models import DocumentType, DocumentVersion
+from mayan.apps.documents.tests import TEST_DOCUMENT_PATH, TEST_DOCUMENT_TYPE_LABEL
from ..models import DetachedSignature, EmbeddedSignature
from ..tasks import task_verify_missing_embedded_signature
diff --git a/mayan/apps/document_signatures/tests/test_views.py b/mayan/apps/document_signatures/tests/test_views.py
index c09a28ab1b..870a682a02 100644
--- a/mayan/apps/document_signatures/tests/test_views.py
+++ b/mayan/apps/document_signatures/tests/test_views.py
@@ -6,9 +6,9 @@ from django.core.files import File
from django_downloadview.test import assert_download_response
-from django_gpg.models import Key
-from documents.models import DocumentVersion
-from documents.tests import (
+from mayan.apps.django_gpg.models import Key
+from mayan.apps.documents.models import DocumentVersion
+from mayan.apps.documents.tests import (
GenericDocumentViewTestCase, TEST_DOCUMENT_PATH
)
diff --git a/mayan/apps/document_signatures/views.py b/mayan/apps/document_signatures/views.py
index bb3828aaef..5f837902d6 100644
--- a/mayan/apps/document_signatures/views.py
+++ b/mayan/apps/document_signatures/views.py
@@ -11,15 +11,15 @@ from django.urls import reverse
from django.utils.encoding import force_text
from django.utils.translation import ugettext_lazy as _
-from acls.models import AccessControlList
-from common.generics import (
+from mayan.apps.acls.models import AccessControlList
+from mayan.apps.common.generics import (
ConfirmView, FormView, SingleObjectCreateView, SingleObjectDeleteView,
SingleObjectDetailView, SingleObjectDownloadView, SingleObjectListView
)
-from common.utils import TemporaryFile
-from django_gpg.exceptions import NeedPassphrase, PassphraseError
-from django_gpg.permissions import permission_key_sign
-from documents.models import DocumentVersion
+from mayan.apps.common.utils import TemporaryFile
+from mayan.apps.django_gpg.exceptions import NeedPassphrase, PassphraseError
+from mayan.apps.django_gpg.permissions import permission_key_sign
+from mayan.apps.documents.models import DocumentVersion
from .forms import (
DocumentVersionSignatureCreateForm,
diff --git a/mayan/apps/document_states/__init__.py b/mayan/apps/document_states/__init__.py
index 12d0c02e4a..93c7800ab3 100644
--- a/mayan/apps/document_states/__init__.py
+++ b/mayan/apps/document_states/__init__.py
@@ -1,3 +1,3 @@
from __future__ import unicode_literals
-default_app_config = 'document_states.apps.DocumentStatesApp'
+default_app_config = 'mayan.apps.document_states.apps.DocumentStatesApp'
diff --git a/mayan/apps/document_states/api_views.py b/mayan/apps/document_states/api_views.py
index 9466b88e23..dd3ada2d3f 100644
--- a/mayan/apps/document_states/api_views.py
+++ b/mayan/apps/document_states/api_views.py
@@ -4,11 +4,11 @@ from django.shortcuts import get_object_or_404
from rest_framework import generics
-from acls.models import AccessControlList
-from documents.models import Document, DocumentType
-from documents.permissions import permission_document_type_view
-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, DocumentType
+from mayan.apps.documents.permissions import permission_document_type_view
+from mayan.apps.rest_api.filters import MayanObjectPermissionsFilter
+from mayan.apps.rest_api.permissions import MayanPermission
from .models import Workflow
from .permissions import (
diff --git a/mayan/apps/document_states/apps.py b/mayan/apps/document_states/apps.py
index 9535f7abca..dd41dd7cf8 100644
--- a/mayan/apps/document_states/apps.py
+++ b/mayan/apps/document_states/apps.py
@@ -6,18 +6,18 @@ from django.utils.translation import ugettext_lazy as _
from kombu import Exchange, Queue
-from acls import ModelPermission
-from acls.links import link_acl_list
-from common import (
+from mayan.apps.acls import ModelPermission
+from mayan.apps.acls.links import link_acl_list
+from mayan.apps.common import (
MayanAppConfig, menu_facet, menu_main, menu_object, menu_secondary,
menu_setup, menu_sidebar, menu_tools
)
-from common.classes import ModelAttribute
-from common.links import link_object_error_list
-from common.permissions_runtime import permission_error_log_view
-from common.widgets import TwoStateWidget
+from mayan.apps.common.classes import ModelAttribute
+from mayan.apps.common.links import link_object_error_list
+from mayan.apps.common.permissions_runtime import permission_error_log_view
+from mayan.apps.common.widgets import TwoStateWidget
+from mayan.apps.navigation import SourceColumn
from mayan.celery import app
-from navigation import SourceColumn
from .classes import DocumentStateHelper, WorkflowAction
from .handlers import (
@@ -50,11 +50,12 @@ from .widgets import widget_transition_events
class DocumentStatesApp(MayanAppConfig):
- app_url = 'states'
+ app_namespace = 'document_states'
+ app_url = 'workflows'
has_rest_api = True
has_tests = True
- name = 'document_states'
- verbose_name = _('Document states')
+ name = 'mayan.apps.document_states'
+ verbose_name = _('Workflows')
def ready(self):
super(DocumentStatesApp, self).ready()
@@ -251,7 +252,7 @@ class DocumentStatesApp(MayanAppConfig):
app.conf.CELERY_ROUTES.update(
{
- 'document_states.tasks.task_launch_all_workflows': {
+ 'mayan.apps.document_states.tasks.task_launch_all_workflows': {
'queue': 'document_states'
},
}
diff --git a/mayan/apps/document_states/classes.py b/mayan/apps/document_states/classes.py
index 7a0cf8d1d2..b06de1c2cf 100644
--- a/mayan/apps/document_states/classes.py
+++ b/mayan/apps/document_states/classes.py
@@ -7,7 +7,7 @@ from django.apps import apps
from django.utils import six
from django.utils.encoding import force_text
-from common.classes import PropertyHelper
+from mayan.apps.common.classes import PropertyHelper
__all__ = ('WorkflowAction',)
logger = logging.getLogger(__name__)
diff --git a/mayan/apps/document_states/error_logs.py b/mayan/apps/document_states/error_logs.py
index 52620e27de..b87b9ef298 100644
--- a/mayan/apps/document_states/error_logs.py
+++ b/mayan/apps/document_states/error_logs.py
@@ -2,7 +2,7 @@ from __future__ import unicode_literals
from django.utils.translation import ugettext_lazy as _
-from common.classes import ErrorLogNamespace
+from mayan.apps.common.classes import ErrorLogNamespace
error_log_state_actions = ErrorLogNamespace(
name='workflow_state_actions', label=_('Workflow state actions')
diff --git a/mayan/apps/document_states/forms.py b/mayan/apps/document_states/forms.py
index b3b4a7df16..c0eeea3544 100644
--- a/mayan/apps/document_states/forms.py
+++ b/mayan/apps/document_states/forms.py
@@ -9,7 +9,7 @@ from django.forms.formsets import formset_factory
from django.utils.module_loading import import_string
from django.utils.translation import ugettext_lazy as _
-from common.forms import DynamicModelForm
+from mayan.apps.common.forms import DynamicModelForm
from .classes import WorkflowAction
from .models import (
diff --git a/mayan/apps/document_states/handlers.py b/mayan/apps/document_states/handlers.py
index a008934fcc..0d7db30c75 100644
--- a/mayan/apps/document_states/handlers.py
+++ b/mayan/apps/document_states/handlers.py
@@ -3,8 +3,8 @@ from __future__ import unicode_literals
from django.apps import apps
from django.utils.translation import ugettext_lazy as _
-from document_indexing.tasks import task_index_document
-from events.classes import EventType
+from mayan.apps.document_indexing.tasks import task_index_document
+from mayan.apps.events.classes import EventType
def handler_index_document(sender, **kwargs):
diff --git a/mayan/apps/document_states/icons.py b/mayan/apps/document_states/icons.py
index bb94d68948..238105d50e 100644
--- a/mayan/apps/document_states/icons.py
+++ b/mayan/apps/document_states/icons.py
@@ -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_workflow_instance_list = Icon(
driver_name='fontawesome', symbol='sitemap'
diff --git a/mayan/apps/document_states/links.py b/mayan/apps/document_states/links.py
index f134c47a92..d57fa71e30 100644
--- a/mayan/apps/document_states/links.py
+++ b/mayan/apps/document_states/links.py
@@ -2,7 +2,7 @@ from __future__ import unicode_literals
from django.utils.translation import ugettext_lazy as _
-from navigation import Link
+from mayan.apps.navigation import Link
from .icons import (
icon_document_workflow_instance_list, icon_setup_workflow_list,
diff --git a/mayan/apps/document_states/migrations/0004_workflow_internal_name.py b/mayan/apps/document_states/migrations/0004_workflow_internal_name.py
index cf7e13ebf5..3750439352 100644
--- a/mayan/apps/document_states/migrations/0004_workflow_internal_name.py
+++ b/mayan/apps/document_states/migrations/0004_workflow_internal_name.py
@@ -5,7 +5,7 @@ from __future__ import unicode_literals
from django.db import migrations, models
from django.utils.text import slugify
-from common.validators import validate_internal_name
+from mayan.apps.common.validators import validate_internal_name
def generate_internal_name(apps, schema_editor):
diff --git a/mayan/apps/document_states/models.py b/mayan/apps/document_states/models.py
index 8262e1dcce..8b8388eba7 100644
--- a/mayan/apps/document_states/models.py
+++ b/mayan/apps/document_states/models.py
@@ -14,10 +14,10 @@ from django.utils.encoding import force_text, python_2_unicode_compatible
from django.utils.module_loading import import_string
from django.utils.translation import ugettext_lazy as _
-from acls.models import AccessControlList
-from common.validators import validate_internal_name
-from documents.models import Document, DocumentType
-from events.models import StoredEventType
+from mayan.apps.acls.models import AccessControlList
+from mayan.apps.common.validators import validate_internal_name
+from mayan.apps.documents.models import Document, DocumentType
+from mayan.apps.events.models import StoredEventType
from .error_logs import error_log_state_actions
from .literals import (
diff --git a/mayan/apps/document_states/permissions.py b/mayan/apps/document_states/permissions.py
index 470c196a41..4c37bcabf9 100644
--- a/mayan/apps/document_states/permissions.py
+++ b/mayan/apps/document_states/permissions.py
@@ -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_states', _('Document workflows'))
diff --git a/mayan/apps/document_states/queues.py b/mayan/apps/document_states/queues.py
index 383fa77761..b35f50b54e 100644
--- a/mayan/apps/document_states/queues.py
+++ b/mayan/apps/document_states/queues.py
@@ -2,12 +2,12 @@ from __future__ import absolute_import, unicode_literals
from django.utils.translation import ugettext_lazy as _
-from task_manager.classes import CeleryQueue
+from mayan.apps.task_manager.classes import CeleryQueue
queue_document_states = CeleryQueue(
name='document_states', label=_('Document states')
)
queue_document_states.add_task_type(
- name='document_states.tasks.task_launch_all_workflows',
+ name='mayan.apps.document_states.tasks.task_launch_all_workflows',
label=_('Launch all workflows')
)
diff --git a/mayan/apps/document_states/serializers.py b/mayan/apps/document_states/serializers.py
index 4739bfe714..fabf978dd5 100644
--- a/mayan/apps/document_states/serializers.py
+++ b/mayan/apps/document_states/serializers.py
@@ -7,9 +7,9 @@ from rest_framework import serializers
from rest_framework.exceptions import ValidationError
from rest_framework.reverse import reverse
-from documents.models import DocumentType
-from documents.serializers import DocumentTypeSerializer
-from user_management.serializers import UserSerializer
+from mayan.apps.documents.models import DocumentType
+from mayan.apps.documents.serializers import DocumentTypeSerializer
+from mayan.apps.user_management.serializers import UserSerializer
from .models import (
Workflow, WorkflowInstance, WorkflowInstanceLogEntry, WorkflowState,
diff --git a/mayan/apps/document_states/tests/test_actions.py b/mayan/apps/document_states/tests/test_actions.py
index 9efbe58405..5d944d1a27 100644
--- a/mayan/apps/document_states/tests/test_actions.py
+++ b/mayan/apps/document_states/tests/test_actions.py
@@ -1,6 +1,6 @@
from __future__ import unicode_literals
-from documents.tests.test_models import GenericDocumentTestCase
+from mayan.apps.documents.tests.test_models import GenericDocumentTestCase
class ActionTestCase(GenericDocumentTestCase):
diff --git a/mayan/apps/document_states/tests/test_api.py b/mayan/apps/document_states/tests/test_api.py
index 97f6340679..9766d17aac 100644
--- a/mayan/apps/document_states/tests/test_api.py
+++ b/mayan/apps/document_states/tests/test_api.py
@@ -4,12 +4,12 @@ from django.test import override_settings
from rest_framework import status
-from documents.models import DocumentType
-from documents.permissions import permission_document_type_view
-from documents.tests.literals import (
+from mayan.apps.documents.models import DocumentType
+from mayan.apps.documents.permissions import permission_document_type_view
+from mayan.apps.documents.tests.literals import (
TEST_DOCUMENT_TYPE_LABEL, TEST_SMALL_DOCUMENT_PATH
)
-from rest_api.tests import BaseAPITestCase
+from mayan.apps.rest_api.tests import BaseAPITestCase
from ..models import Workflow
from ..permissions import (
diff --git a/mayan/apps/document_states/tests/test_models.py b/mayan/apps/document_states/tests/test_models.py
index 91fc868896..c047441fa8 100644
--- a/mayan/apps/document_states/tests/test_models.py
+++ b/mayan/apps/document_states/tests/test_models.py
@@ -2,10 +2,12 @@ from __future__ import unicode_literals
from django.test import override_settings
-from common.tests import BaseTestCase
-from documents.models import DocumentType
-from documents.tests import TEST_SMALL_DOCUMENT_PATH, TEST_DOCUMENT_TYPE_LABEL
-from document_indexing.models import Index, IndexInstanceNode
+from mayan.apps.common.tests import BaseTestCase
+from mayan.apps.documents.models import DocumentType
+from mayan.apps.documents.tests import (
+ TEST_SMALL_DOCUMENT_PATH, TEST_DOCUMENT_TYPE_LABEL
+)
+from mayan.apps.document_indexing.models import Index, IndexInstanceNode
from ..models import Workflow
diff --git a/mayan/apps/document_states/tests/test_views.py b/mayan/apps/document_states/tests/test_views.py
index 3537a4f3a2..1cd97d4934 100644
--- a/mayan/apps/document_states/tests/test_views.py
+++ b/mayan/apps/document_states/tests/test_views.py
@@ -1,7 +1,7 @@
from __future__ import unicode_literals
-from common.tests import GenericViewTestCase
-from documents.tests import (
+from mayan.apps.common.tests import GenericViewTestCase
+from mayan.apps.documents.tests import (
GenericDocumentViewTestCase, TEST_SMALL_DOCUMENT_PATH
)
diff --git a/mayan/apps/document_states/views.py b/mayan/apps/document_states/views.py
index 9b6b26eb52..4ea96e24c5 100644
--- a/mayan/apps/document_states/views.py
+++ b/mayan/apps/document_states/views.py
@@ -10,17 +10,17 @@ from django.template import RequestContext
from django.urls import reverse, reverse_lazy
from django.utils.translation import ugettext_lazy as _
-from acls.models import AccessControlList
-from common.views import (
+from mayan.apps.acls.models import AccessControlList
+from mayan.apps.common.views import (
AssignRemoveView, ConfirmView, FormView, SingleObjectCreateView,
SingleObjectDeleteView, SingleObjectDetailView,
SingleObjectDynamicFormCreateView, SingleObjectDynamicFormEditView,
SingleObjectDownloadView, SingleObjectEditView, SingleObjectListView
)
-from documents.models import Document
-from documents.views import DocumentListView
-from events.classes import EventType
-from events.models import StoredEventType
+from mayan.apps.documents.models import Document
+from mayan.apps.documents.views import DocumentListView
+from mayan.apps.events.classes import EventType
+from mayan.apps.events.models import StoredEventType
from .classes import WorkflowAction
from .forms import (
diff --git a/mayan/apps/documents/__init__.py b/mayan/apps/documents/__init__.py
index c6d5147424..30e4b68be7 100644
--- a/mayan/apps/documents/__init__.py
+++ b/mayan/apps/documents/__init__.py
@@ -1,3 +1,3 @@
from __future__ import unicode_literals
-default_app_config = 'documents.apps.DocumentsApp'
+default_app_config = 'mayan.apps.documents.apps.DocumentsApp'
diff --git a/mayan/apps/documents/api_views.py b/mayan/apps/documents/api_views.py
index 1fc320cc82..baba77087d 100644
--- a/mayan/apps/documents/api_views.py
+++ b/mayan/apps/documents/api_views.py
@@ -10,9 +10,9 @@ from django_downloadview import DownloadMixin, VirtualFile
from rest_framework import generics, status
from rest_framework.response import Response
-from acls.models import AccessControlList
-from rest_api.filters import MayanObjectPermissionsFilter
-from rest_api.permissions import MayanPermission
+from mayan.apps.acls.models import AccessControlList
+from mayan.apps.rest_api.filters import MayanObjectPermissionsFilter
+from mayan.apps.rest_api.permissions import MayanPermission
from .literals import DOCUMENT_IMAGE_TASK_TIMEOUT
from .models import (
diff --git a/mayan/apps/documents/apps.py b/mayan/apps/documents/apps.py
index 08e7d93a19..e6bb9e69ba 100644
--- a/mayan/apps/documents/apps.py
+++ b/mayan/apps/documents/apps.py
@@ -7,31 +7,31 @@ from kombu import Exchange, Queue
from django.db.models.signals import post_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, MissingItem, menu_facet, menu_main, menu_object,
menu_secondary, menu_setup, menu_sidebar, menu_multi_item, menu_tools
)
-from common.classes import ModelField
-from common.dashboards import dashboard_main
-from common.signals import post_initial_setup
-from common.widgets import TwoStateWidget
-from converter.links import link_transformation_list
-from converter.permissions import (
+from mayan.apps.common.classes import ModelField
+from mayan.apps.common.dashboards import dashboard_main
+from mayan.apps.common.signals import post_initial_setup
+from mayan.apps.common.widgets import TwoStateWidget
+from mayan.apps.converter.links import link_transformation_list
+from mayan.apps.converter.permissions import (
permission_transformation_create,
permission_transformation_delete, permission_transformation_edit,
permission_transformation_view,
)
-from events import ModelEventType
-from events.links import (
+from mayan.apps.events import ModelEventType
+from mayan.apps.events.links import (
link_events_for_object, link_object_event_types_user_subcriptions_list,
)
-from events.permissions import permission_events_view
+from mayan.apps.events.permissions import permission_events_view
+from mayan.apps.navigation import SourceColumn
+from mayan.apps.rest_api.fields import DynamicSerializerField
from mayan.celery import app
-from navigation import SourceColumn
-from rest_api.fields import DynamicSerializerField
from .dashboard_widgets import (
DashboardWidgetDocumentPagesTotal, DashboardWidgetDocumentsInTrash,
@@ -109,9 +109,11 @@ from .widgets import (
class DocumentsApp(MayanAppConfig):
+ app_namespace = 'documents'
+ app_url = 'documents'
has_rest_api = True
has_tests = True
- name = 'documents'
+ name = 'mayan.apps.documents'
verbose_name = _('Documents')
def ready(self):
@@ -129,7 +131,7 @@ class DocumentsApp(MayanAppConfig):
DynamicSerializerField.add_serializer(
klass=Document,
- serializer_class='documents.serializers.DocumentSerializer'
+ serializer_class='mayan.apps.documents.serializers.DocumentSerializer'
)
MissingItem(
@@ -334,17 +336,17 @@ class DocumentsApp(MayanAppConfig):
app.conf.CELERYBEAT_SCHEDULE.update(
{
'task_check_delete_periods': {
- 'task': 'documents.tasks.task_check_delete_periods',
+ 'task': 'mayan.apps.documents.tasks.task_check_delete_periods',
'schedule': timedelta(
seconds=CHECK_DELETE_PERIOD_INTERVAL
),
},
'task_check_trash_periods': {
- 'task': 'documents.tasks.task_check_trash_periods',
+ 'task': 'mayan.apps.documents.tasks.task_check_trash_periods',
'schedule': timedelta(seconds=CHECK_TRASH_PERIOD_INTERVAL),
},
'task_delete_stubs': {
- 'task': 'documents.tasks.task_delete_stubs',
+ 'task': 'mayan.apps.documents.tasks.task_delete_stubs',
'schedule': timedelta(seconds=DELETE_STALE_STUBS_INTERVAL),
},
}
@@ -369,37 +371,37 @@ class DocumentsApp(MayanAppConfig):
app.conf.CELERY_ROUTES.update(
{
- 'documents.tasks.task_check_delete_periods': {
+ 'mayan.apps.documents.tasks.task_check_delete_periods': {
'queue': 'documents_periodic'
},
- 'documents.tasks.task_check_trash_periods': {
+ 'mayan.apps.documents.tasks.task_check_trash_periods': {
'queue': 'documents_periodic'
},
- 'documents.tasks.task_clean_empty_duplicate_lists': {
+ 'mayan.apps.documents.tasks.task_clean_empty_duplicate_lists': {
'queue': 'documents'
},
- 'documents.tasks.task_clear_image_cache': {
+ 'mayan.apps.documents.tasks.task_clear_image_cache': {
'queue': 'tools'
},
- 'documents.tasks.task_delete_document': {
+ 'mayan.apps.documents.tasks.task_delete_document': {
'queue': 'documents'
},
- 'documents.tasks.task_delete_stubs': {
+ 'mayan.apps.documents.tasks.task_delete_stubs': {
'queue': 'documents_periodic'
},
- 'documents.tasks.task_generate_document_page_image': {
+ 'mayan.apps.documents.tasks.task_generate_document_page_image': {
'queue': 'converter'
},
- 'documents.tasks.task_scan_duplicates_all': {
+ 'mayan.apps.documents.tasks.task_scan_duplicates_all': {
'queue': 'tools'
},
- 'documents.tasks.task_scan_duplicates_for': {
+ 'mayan.apps.documents.tasks.task_scan_duplicates_for': {
'queue': 'uploads'
},
- 'documents.tasks.task_update_page_count': {
+ 'mayan.apps.documents.tasks.task_update_page_count': {
'queue': 'uploads'
},
- 'documents.tasks.task_upload_new_version': {
+ 'mayan.apps.documents.tasks.task_upload_new_version': {
'queue': 'uploads'
},
}
diff --git a/mayan/apps/documents/dashboard_widgets.py b/mayan/apps/documents/dashboard_widgets.py
index bfd2d3ad6c..fb42590a96 100644
--- a/mayan/apps/documents/dashboard_widgets.py
+++ b/mayan/apps/documents/dashboard_widgets.py
@@ -4,7 +4,7 @@ from django.apps import apps
from django.urls import reverse_lazy
from django.utils.translation import ugettext_lazy as _
-from common.classes import DashboardWidgetNumeric
+from mayan.apps.common.classes import DashboardWidgetNumeric
from .icons import (
icon_dashboard_documents_in_trash, icon_dashboard_document_types,
diff --git a/mayan/apps/documents/events.py b/mayan/apps/documents/events.py
index 9f24d1f1b0..817970f27d 100644
--- a/mayan/apps/documents/events.py
+++ b/mayan/apps/documents/events.py
@@ -2,7 +2,7 @@ from __future__ import absolute_import, unicode_literals
from django.utils.translation import ugettext_lazy as _
-from events import EventTypeNamespace
+from mayan.apps.events import EventTypeNamespace
namespace = EventTypeNamespace(name='documents', label=_('Documents'))
diff --git a/mayan/apps/documents/forms.py b/mayan/apps/documents/forms.py
index 0e1254dd84..136939a3cb 100644
--- a/mayan/apps/documents/forms.py
+++ b/mayan/apps/documents/forms.py
@@ -7,8 +7,8 @@ from django import forms
from django.template.defaultfilters import filesizeformat
from django.utils.translation import ugettext_lazy as _
-from acls.models import AccessControlList
-from common.forms import DetailForm
+from mayan.apps.acls.models import AccessControlList
+from mayan.apps.common.forms import DetailForm
from .fields import (
DocumentField, DocumentPageField, DocumentVersionField
diff --git a/mayan/apps/documents/icons.py b/mayan/apps/documents/icons.py
index b79934b0ec..a469f83077 100644
--- a/mayan/apps/documents/icons.py
+++ b/mayan/apps/documents/icons.py
@@ -1,6 +1,6 @@
from __future__ import absolute_import, unicode_literals
-from appearance.classes import Icon
+from mayan.apps.appearance.classes import Icon
icon_clear_image_cache = Icon(driver_name='fontawesome', symbol='file-image')
icon_dashboard_document_types = Icon(
diff --git a/mayan/apps/documents/links.py b/mayan/apps/documents/links.py
index 3d05d4c352..ef61a8df9c 100644
--- a/mayan/apps/documents/links.py
+++ b/mayan/apps/documents/links.py
@@ -2,10 +2,10 @@ from __future__ import absolute_import, unicode_literals
from django.utils.translation import ugettext_lazy as _
-from converter.permissions import (
+from mayan.apps.converter.permissions import (
permission_transformation_delete, permission_transformation_edit
)
-from navigation import Link
+from mayan.apps.navigation import Link
from .icons import (
icon_clear_image_cache, icon_document_duplicates_list, icon_document_list,
diff --git a/mayan/apps/documents/literals.py b/mayan/apps/documents/literals.py
index 47777469aa..2c3fe0bccf 100644
--- a/mayan/apps/documents/literals.py
+++ b/mayan/apps/documents/literals.py
@@ -2,7 +2,7 @@ from __future__ import unicode_literals
from django.utils.translation import ugettext_lazy as _
-from common.literals import TIME_DELTA_UNIT_DAYS
+from mayan.apps.common.literals import TIME_DELTA_UNIT_DAYS
CHECK_DELETE_PERIOD_INTERVAL = 60
CHECK_TRASH_PERIOD_INTERVAL = 60
diff --git a/mayan/apps/documents/menus.py b/mayan/apps/documents/menus.py
index 9dc48882b0..71f2ad08a8 100644
--- a/mayan/apps/documents/menus.py
+++ b/mayan/apps/documents/menus.py
@@ -2,7 +2,7 @@ from __future__ import absolute_import, unicode_literals
from django.utils.translation import ugettext_lazy as _
-from navigation import Menu
+from mayan.apps.navigation import Menu
from .icons import icon_menu_documents
diff --git a/mayan/apps/documents/migrations/0003_auto_20150608_1915.py b/mayan/apps/documents/migrations/0003_auto_20150608_1915.py
index f10ffed0fc..c160252508 100644
--- a/mayan/apps/documents/migrations/0003_auto_20150608_1915.py
+++ b/mayan/apps/documents/migrations/0003_auto_20150608_1915.py
@@ -4,7 +4,7 @@ from __future__ import unicode_literals
from django.db import models, migrations
from django.core.files.storage import FileSystemStorage
-import documents.models
+import mayan.apps.documents.models
class Migration(migrations.Migration):
@@ -18,7 +18,7 @@ class Migration(migrations.Migration):
model_name='document',
name='uuid',
field=models.CharField(
- default=documents.models.UUID_FUNCTION, max_length=48,
+ default=mayan.apps.documents.models.UUID_FUNCTION, max_length=48,
editable=False
),
preserve_default=True,
@@ -27,7 +27,7 @@ class Migration(migrations.Migration):
model_name='documentversion',
name='file',
field=models.FileField(
- upload_to=documents.models.UUID_FUNCTION,
+ upload_to=mayan.apps.documents.models.UUID_FUNCTION,
storage=FileSystemStorage(),
verbose_name='File'
),
diff --git a/mayan/apps/documents/migrations/0042_auto_20180403_0702.py b/mayan/apps/documents/migrations/0042_auto_20180403_0702.py
index 4910f66398..a2528917e0 100644
--- a/mayan/apps/documents/migrations/0042_auto_20180403_0702.py
+++ b/mayan/apps/documents/migrations/0042_auto_20180403_0702.py
@@ -4,7 +4,8 @@ from __future__ import unicode_literals
import django.core.files.storage
from django.db import migrations, models
-import documents.models
+
+import mayan.apps.documents.models
class Migration(migrations.Migration):
@@ -17,6 +18,6 @@ class Migration(migrations.Migration):
migrations.AlterField(
model_name='documentversion',
name='file',
- field=models.FileField(storage=django.core.files.storage.FileSystemStorage(location=b'mayan/media/document_storage'), upload_to=documents.models.UUID_FUNCTION, verbose_name='File'),
+ field=models.FileField(storage=django.core.files.storage.FileSystemStorage(location=b'mayan/media/document_storage'), upload_to=mayan.apps.documents.models.UUID_FUNCTION, verbose_name='File'),
),
]
diff --git a/mayan/apps/documents/migrations/0043_auto_20180429_0759.py b/mayan/apps/documents/migrations/0043_auto_20180429_0759.py
index fc93acd785..8c191900ae 100644
--- a/mayan/apps/documents/migrations/0043_auto_20180429_0759.py
+++ b/mayan/apps/documents/migrations/0043_auto_20180429_0759.py
@@ -4,7 +4,8 @@ from __future__ import unicode_literals
import django.core.files.storage
from django.db import migrations, models
-import documents.models
+
+import mayan.apps.documents.models
class Migration(migrations.Migration):
@@ -22,7 +23,7 @@ class Migration(migrations.Migration):
migrations.AlterField(
model_name='documentversion',
name='file',
- field=models.FileField(storage=django.core.files.storage.FileSystemStorage(location=b'/home/rosarior/development/mayan-edms/mayan/media/document_storage'), upload_to=documents.models.UUID_FUNCTION, verbose_name='File'),
+ field=models.FileField(storage=django.core.files.storage.FileSystemStorage(location=b'/home/rosarior/development/mayan-edms/mayan/media/document_storage'), upload_to=mayan.apps.documents.models.UUID_FUNCTION, verbose_name='File'),
),
migrations.AlterField(
model_name='documentversion',
diff --git a/mayan/apps/documents/models.py b/mayan/apps/documents/models.py
index f5b973e01d..08a034cbba 100644
--- a/mayan/apps/documents/models.py
+++ b/mayan/apps/documents/models.py
@@ -17,16 +17,16 @@ from django.utils.encoding import force_text, python_2_unicode_compatible
from django.utils.timezone import now
from django.utils.translation import ugettext, ugettext_lazy as _
-from acls.models import AccessControlList
-from common.literals import TIME_DELTA_UNIT_CHOICES
-from converter import (
+from mayan.apps.acls.models import AccessControlList
+from mayan.apps.common.literals import TIME_DELTA_UNIT_CHOICES
+from mayan.apps.converter import (
converter_class, BaseTransformation, TransformationResize,
TransformationRotate, TransformationZoom
)
-from converter.exceptions import InvalidOfficeFormat, PageCountError
-from converter.literals import DEFAULT_ZOOM_LEVEL, DEFAULT_ROTATION
-from converter.models import Transformation
-from mimetype.api import get_mimetype
+from mayan.apps.converter.exceptions import InvalidOfficeFormat, PageCountError
+from mayan.apps.converter.literals import DEFAULT_ZOOM_LEVEL, DEFAULT_ROTATION
+from mayan.apps.converter.models import Transformation
+from mayan.apps.mimetype.api import get_mimetype
from .events import (
event_document_create, event_document_new_version,
diff --git a/mayan/apps/documents/permissions.py b/mayan/apps/documents/permissions.py
index df40208190..dc3d867f2b 100644
--- a/mayan/apps/documents/permissions.py
+++ b/mayan/apps/documents/permissions.py
@@ -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('documents', _('Documents'))
diff --git a/mayan/apps/documents/queues.py b/mayan/apps/documents/queues.py
index 20c9a43659..c97f3dc61c 100644
--- a/mayan/apps/documents/queues.py
+++ b/mayan/apps/documents/queues.py
@@ -2,8 +2,8 @@ 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_converter = CeleryQueue(
name='converter', label=_('Converter'), transient=True
@@ -19,42 +19,42 @@ queue_documents = CeleryQueue(
)
queue_converter.add_task_type(
- name='documents.tasks.task_generate_document_page_image',
+ name='mayan.apps.documents.tasks.task_generate_document_page_image',
label=_('Generate document page image')
)
queue_documents.add_task_type(
- name='documents.tasks.task_delete_document',
+ name='mayan.apps.documents.tasks.task_delete_document',
label=_('Delete a document')
)
queue_documents.add_task_type(
- name='documents.tasks.task_clean_empty_duplicate_lists',
+ name='mayan.apps.documents.tasks.task_clean_empty_duplicate_lists',
label=_('Clean empty duplicate lists')
)
queue_documents_periodic.add_task_type(
- name='documents.tasks.task_check_delete_periods',
+ name='mayan.apps.documents.tasks.task_check_delete_periods',
label=_('Check document type delete periods')
)
queue_documents_periodic.add_task_type(
- name='documents.tasks.task_check_trash_periods',
+ name='mayan.apps.documents.tasks.task_check_trash_periods',
label=_('Check document type trash periods')
)
queue_documents_periodic.add_task_type(
- name='documents.tasks.task_delete_stubs',
+ name='mayan.apps.documents.tasks.task_delete_stubs',
label=_('Delete document stubs')
)
queue_tools.add_task_type(
- name='documents.tasks.task_clear_image_cache',
+ name='mayan.apps.documents.tasks.task_clear_image_cache',
label=_('Clear image cache')
)
queue_uploads.add_task_type(
- name='documents.tasks.task_update_page_count',
+ name='mayan.apps.documents.tasks.task_update_page_count',
label=_('Update document page count')
)
queue_uploads.add_task_type(
- name='documents.tasks.task_upload_new_version',
+ name='mayan.apps.documents.tasks.task_upload_new_version',
label=_('Upload new document version')
)
diff --git a/mayan/apps/documents/search.py b/mayan/apps/documents/search.py
index 0ddacc81cc..e418c7d48a 100644
--- a/mayan/apps/documents/search.py
+++ b/mayan/apps/documents/search.py
@@ -2,14 +2,14 @@ from __future__ import absolute_import, unicode_literals
from django.utils.translation import ugettext_lazy as _
-from dynamic_search.classes import SearchModel
+from mayan.apps.dynamic_search.classes import SearchModel
from .permissions import permission_document_view
document_search = SearchModel(
app_label='documents', model_name='Document',
permission=permission_document_view,
- serializer_string='documents.serializers.DocumentSerializer'
+ serializer_string='mayan.apps.documents.serializers.DocumentSerializer'
)
document_search.add_model_field(
@@ -27,7 +27,7 @@ document_search.add_model_field(
document_page_search = SearchModel(
app_label='documents', model_name='DocumentPageResult',
permission=permission_document_view,
- serializer_string='documents.serializers.DocumentPageSerializer'
+ serializer_string='mayan.apps.documents.serializers.DocumentPageSerializer'
)
document_page_search.add_model_field(
diff --git a/mayan/apps/documents/serializers.py b/mayan/apps/documents/serializers.py
index 8def99ad0d..fcda698ce4 100644
--- a/mayan/apps/documents/serializers.py
+++ b/mayan/apps/documents/serializers.py
@@ -5,7 +5,7 @@ from django.utils.encoding import force_text
from rest_framework import serializers
from rest_framework.reverse import reverse
-from common.models import SharedUploadedFile
+from mayan.apps.common.models import SharedUploadedFile
from .models import (
Document, DocumentVersion, DocumentPage, DocumentType,
diff --git a/mayan/apps/documents/settings.py b/mayan/apps/documents/settings.py
index 794c433a5e..331f12f7ff 100644
--- a/mayan/apps/documents/settings.py
+++ b/mayan/apps/documents/settings.py
@@ -5,7 +5,7 @@ import os
from django.conf import settings
from django.utils.translation import ugettext_lazy as _
-from smart_settings import Namespace
+from mayan.apps.smart_settings import Namespace
from .literals import DEFAULT_LANGUAGE, DEFAULT_LANGUAGE_CODES
diff --git a/mayan/apps/documents/statistics.py b/mayan/apps/documents/statistics.py
index 8ba196867f..d45a89b5a7 100644
--- a/mayan/apps/documents/statistics.py
+++ b/mayan/apps/documents/statistics.py
@@ -8,7 +8,7 @@ from django.utils.translation import ugettext_lazy as _
import qsstats
-from mayan_statistics import StatisticLineChart, StatisticNamespace
+from mayan.apps.mayan_statistics import StatisticLineChart, StatisticNamespace
from .permissions import permission_document_view
diff --git a/mayan/apps/documents/templates/documents/forms/widgets/document_page_image.html b/mayan/apps/documents/templates/documents/forms/widgets/document_page_image.html
index 87c26a5011..6637a46de0 100644
--- a/mayan/apps/documents/templates/documents/forms/widgets/document_page_image.html
+++ b/mayan/apps/documents/templates/documents/forms/widgets/document_page_image.html
@@ -5,7 +5,7 @@
- {% get_icon 'documents.icons.icon_document_image_loading' %}
+ {% get_icon 'mayan.apps.documents.icons.icon_document_image_loading' %}
![_('%s]()