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 995be822e0..7abb02017a 100644 --- a/mayan/apps/acls/managers.py +++ b/mayan/apps/acls/managers.py @@ -8,9 +8,9 @@ from django.db import models from django.db.models import Q from django.utils.translation import ugettext, ugettext_lazy as _ -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 800773dc75..490f0991c4 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/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 359530fcf0..26f8273854 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 1d2ad72911..87c0d5c032 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 d6fbe493f3..988d1c63f1 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 cdd4946fa4..3bcccde2a2 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 490d658152..dba9f398b8 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 071709d167..a7c091e303 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 b1eb783da3..4a987a304a 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 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 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 94efaef96a..eccf7f2fec 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 b89b364bcf..05132b8980 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/models.py b/mayan/apps/common/models.py index b4be090857..9edd690708 100644 --- a/mayan/apps/common/models.py +++ b/mayan/apps/common/models.py @@ -17,8 +17,8 @@ from django.utils.functional import cached_property from django.utils.module_loading import import_string from django.utils.translation import ugettext_lazy as _ -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 .managers import ErrorLogEntryManager, UserLocaleProfileManager from .storages import storage_sharedupload 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 3425ed2c76..35a8900d3b 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 cf67bf5ec7..5a4bb8a255 100644 --- a/mayan/apps/common/tests/base.py +++ b/mayan/apps/common/tests/base.py @@ -10,9 +10,9 @@ from django.urls import clear_url_caches, reverse from django_downloadview import assert_download_response -from permissions.classes import Permission -from smart_settings.classes import Namespace -from user_management.tests import ( +from mayan.apps.permissions.classes import Permission +from mayan.apps.smart_settings.classes import Namespace +from mayan.apps.user_management.tests import ( TEST_ADMIN_PASSWORD, TEST_ADMIN_USERNAME, TEST_USER_USERNAME, TEST_USER_PASSWORD ) diff --git a/mayan/apps/common/tests/mixins.py b/mayan/apps/common/tests/mixins.py index 85006a73bc..4020fbbecf 100644 --- a/mayan/apps/common/tests/mixins.py +++ b/mayan/apps/common/tests/mixins.py @@ -8,10 +8,10 @@ from django.contrib.auth import get_user_model from django.contrib.auth.models import Group from django.core import management -from acls.models import AccessControlList -from permissions.models import Role -from permissions.tests.literals import TEST_ROLE_LABEL -from user_management.tests 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.user_management.tests 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/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 0121ea78f2..70249ce69e 100644 --- a/mayan/apps/converter/backends/python.py +++ b/mayan/apps/converter/backends/python.py @@ -11,7 +11,7 @@ import sh 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 439f0d1867..58cf5d3102 100644 --- a/mayan/apps/converter/classes.py +++ b/mayan/apps/converter/classes.py @@ -10,9 +10,9 @@ import sh 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 4338386d85..e16535d48a 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 743e2de588..94bde4e8d5 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 a9592e4648..937e9c64cf 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 7c4d218312..db3a56b431 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_list_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 9f64c0be27..9c6724aabb 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 3bc6279a16..61a5ed9744 100644 --- a/mayan/apps/document_indexing/links.py +++ b/mayan/apps/document_indexing/links.py @@ -2,9 +2,8 @@ from __future__ import unicode_literals from django.utils.translation import ugettext_lazy as _ -from navigation import Link, get_cascade_condition - -from documents.icons import icon_document_type +from mayan.apps.navigation import Link, get_cascade_condition +from mayan.apps.documents.icons import icon_document_type 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 704cab4f92..308758a468 100644 --- a/mayan/apps/document_indexing/models.py +++ b/mayan/apps/document_indexing/models.py @@ -12,11 +12,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_models.py b/mayan/apps/document_indexing/tests/test_models.py index 21f96e2406..9cdb8efbf7 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 51a2ab265d..a990b9d504 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 ModelAttribute, 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 ModelAttribute, 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): @@ -147,7 +149,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 4fad137201..5e9b52320e 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 7c1d8c68d9..7398b74646 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 40268beece..bc6d6c6a36 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 72e8bef4ce..8214685b7b 100644 --- a/mayan/apps/document_states/api_views.py +++ b/mayan/apps/document_states/api_views.py @@ -6,11 +6,11 @@ from django.views.decorators.cache import cache_control, patch_cache_control 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 .literals import WORKFLOW_IMAGE_TASK_TIMEOUT from .models import Workflow diff --git a/mayan/apps/document_states/apps.py b/mayan/apps/document_states/apps.py index dde997d404..80b4aa31c4 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_list_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() @@ -259,10 +260,10 @@ class DocumentStatesApp(MayanAppConfig): app.conf.CELERY_ROUTES.update( { - 'document_states.tasks.task_generate_document_state_image': { + 'mayan.apps.document_states.tasks.task_generate_document_state_image': { 'queue': 'document_states' }, - 'document_states.tasks.task_launch_all_workflows': { + 'mayan.apps.document_states.tasks.task_launch_all_workflows': { 'queue': 'document_states_fast' }, } 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 513223b348..44359762e6 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 .fields import WorfklowImageField 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 64cb3c0fa7..64db956c50 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 a6295aa083..bf6fb91ec7 100644 --- a/mayan/apps/document_states/links.py +++ b/mayan/apps/document_states/links.py @@ -2,8 +2,8 @@ from __future__ import unicode_literals from django.utils.translation import ugettext_lazy as _ -from documents.icons import icon_document_type -from navigation import Link +from mayan.apps.documents.icons import icon_document_type +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 be7a2574da..b228cbc86f 100644 --- a/mayan/apps/document_states/models.py +++ b/mayan/apps/document_states/models.py @@ -18,10 +18,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 15f9ffed86..ec1f213aef 100644 --- a/mayan/apps/document_states/queues.py +++ b/mayan/apps/document_states/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_document_states = CeleryQueue( @@ -13,10 +13,10 @@ queue_document_states_fast = CeleryQueue( ) 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') ) queue_document_states_fast.add_task_type( - name='document_states.tasks.task_generate_document_state_image', + name='mayan.apps.document_states.tasks.task_generate_document_state_image', label=_('Generate workflow previews') ) diff --git a/mayan/apps/document_states/serializers.py b/mayan/apps/document_states/serializers.py index 2b366dac7f..78a055254b 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/settings.py b/mayan/apps/document_states/settings.py index d2508346a1..49a68baa30 100644 --- a/mayan/apps/document_states/settings.py +++ b/mayan/apps/document_states/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='document_states', label=_('Workflows')) 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 45f31aaadf..ef1c94547e 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 5f4cddd535..545f033a58 100644 --- a/mayan/apps/document_states/views.py +++ b/mayan/apps/document_states/views.py @@ -9,17 +9,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, 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 94cfaac508..acf34bdb24 100644 --- a/mayan/apps/documents/api_views.py +++ b/mayan/apps/documents/api_views.py @@ -12,9 +12,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 8aa9b8a1c2..e5906e61ac 100644 --- a/mayan/apps/documents/apps.py +++ b/mayan/apps/documents/apps.py @@ -7,32 +7,32 @@ from kombu import Exchange, Queue from django.db.models.signals import post_delete, post_migrate 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_list_facet, menu_main, menu_object, menu_secondary, menu_setup, menu_sidebar, menu_multi_item, menu_tools ) -from common.classes import ModelField, Template -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, Template +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, @@ -110,9 +110,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): @@ -130,7 +132,7 @@ class DocumentsApp(MayanAppConfig): DynamicSerializerField.add_serializer( klass=Document, - serializer_class='documents.serializers.DocumentSerializer' + serializer_class='mayan.apps.documents.serializers.DocumentSerializer' ) MissingItem( @@ -340,17 +342,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), }, } @@ -375,37 +377,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 58625d8553..ff4e6917a4 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 9f82da6762..371b1c1ad9 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 eabf86321d..c0f7ed5caf 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 afefd71882..60e7912991 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 @@ -31,7 +31,7 @@ DEFAULT_ZIP_FILENAME = 'document_bundle.zip' DEFAULT_DOCUMENT_TYPE_LABEL = _('Default') DOCUMENT_IMAGE_TASK_TIMEOUT = 120 DOCUMENT_IMAGES_CACHE_NAME = 'document_images' -DOCUMENT_CACHE_STORAGE_INSTANCE_PATH = 'documents.storages.storage_documentimagecache' +DOCUMENT_CACHE_STORAGE_INSTANCE_PATH = 'mayan.apps.documents.storages.storage_documentimagecache' STUB_EXPIRATION_INTERVAL = 60 * 60 * 24 # 24 hours TASK_GENERATE_DODCUMENT_PAGE_IMAGE_RETRIES = 6 UPDATE_PAGE_COUNT_RETRY_DELAY = 10 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 74ad63c9e7..76a80c4fae 100644 --- a/mayan/apps/documents/models.py +++ b/mayan/apps/documents/models.py @@ -18,16 +18,16 @@ from django.utils.functional import cached_property 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 a704fd2cc6..322ca7420d 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_DOCUMENTS_CACHE_MAXIMUM_SIZE, 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/tasks.py b/mayan/apps/documents/tasks.py index 6139ead600..0cb371571a 100644 --- a/mayan/apps/documents/tasks.py +++ b/mayan/apps/documents/tasks.py @@ -6,9 +6,9 @@ from django.apps import apps from django.contrib.auth import get_user_model from django.db import OperationalError -from converter.transformations import BaseTransformation -from lock_manager import LockError -from lock_manager.decorators import retry_on_lock_error +from mayan.apps.converter.transformations import BaseTransformation +from mayan.apps.lock_manager import LockError +from mayan.apps.lock_manager.decorators import retry_on_lock_error from mayan.celery import app from .literals import ( 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 7f9dc6ea31..89b3ed4e9a 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 @@ {# Used with the default filter to typecast Python's None to the data attribute's empty string #} {% get_api_image_url instance width=image_width height=image_height zoom=image_zoom rotation=image_rotation as image_url %} diff --git a/mayan/apps/documents/tests/base.py b/mayan/apps/documents/tests/base.py index 4f9eecc7b7..88170c6249 100644 --- a/mayan/apps/documents/tests/base.py +++ b/mayan/apps/documents/tests/base.py @@ -4,7 +4,7 @@ from __future__ import unicode_literals from django.test import override_settings -from common.tests import BaseTestCase, GenericViewTestCase +from mayan.apps.common.tests import BaseTestCase, GenericViewTestCase from .mixins import DocumentTestMixin diff --git a/mayan/apps/documents/tests/test_api.py b/mayan/apps/documents/tests/test_api.py index f80e74dac0..6e1c6e2f12 100644 --- a/mayan/apps/documents/tests/test_api.py +++ b/mayan/apps/documents/tests/test_api.py @@ -10,7 +10,7 @@ from django.utils.encoding import force_text from django_downloadview import assert_download_response from rest_framework import status -from rest_api.tests import BaseAPITestCase +from mayan.apps.rest_api.tests import BaseAPITestCase from ..models import Document, DocumentType from ..permissions import ( diff --git a/mayan/apps/documents/tests/test_document_views.py b/mayan/apps/documents/tests/test_document_views.py index a5bb421d81..dc609c99e8 100644 --- a/mayan/apps/documents/tests/test_document_views.py +++ b/mayan/apps/documents/tests/test_document_views.py @@ -7,8 +7,8 @@ import os from django.contrib.contenttypes.models import ContentType from django.utils.encoding import force_text -from converter.models import Transformation -from converter.permissions import permission_transformation_delete +from mayan.apps.converter.models import Transformation +from mayan.apps.converter.permissions import permission_transformation_delete from ..literals import PAGE_RANGE_ALL from ..models import DeletedDocument, Document, DocumentType diff --git a/mayan/apps/documents/tests/test_events.py b/mayan/apps/documents/tests/test_events.py index 540fca55b4..45c928c0fa 100644 --- a/mayan/apps/documents/tests/test_events.py +++ b/mayan/apps/documents/tests/test_events.py @@ -5,7 +5,7 @@ from __future__ import unicode_literals from actstream.models import Action from django_downloadview import assert_download_response -from user_management.tests.literals import ( +from mayan.apps.user_management.tests.literals import ( TEST_USER_PASSWORD, TEST_USER_USERNAME ) diff --git a/mayan/apps/documents/tests/test_links.py b/mayan/apps/documents/tests/test_links.py index 4ee96b545c..a08ebdf210 100644 --- a/mayan/apps/documents/tests/test_links.py +++ b/mayan/apps/documents/tests/test_links.py @@ -6,7 +6,7 @@ import time from django.urls import reverse -from acls.models import AccessControlList +from mayan.apps.acls.models import AccessControlList from ..links import ( link_document_restore, link_document_version_download, diff --git a/mayan/apps/documents/tests/test_models.py b/mayan/apps/documents/tests/test_models.py index 954487b493..85d5c9b8c1 100644 --- a/mayan/apps/documents/tests/test_models.py +++ b/mayan/apps/documents/tests/test_models.py @@ -5,7 +5,7 @@ import time from django.test import override_settings -from common.tests import BaseTestCase +from mayan.apps.common.tests import BaseTestCase from ..literals import STUB_EXPIRATION_INTERVAL from ..models import ( diff --git a/mayan/apps/documents/tests/test_search.py b/mayan/apps/documents/tests/test_search.py index 660fcecdaf..da333ef8c6 100644 --- a/mayan/apps/documents/tests/test_search.py +++ b/mayan/apps/documents/tests/test_search.py @@ -2,10 +2,10 @@ from __future__ import unicode_literals from django.test import override_settings -from common.tests import BaseTestCase -from documents.permissions import permission_document_view -from documents.search import document_search, document_page_search -from documents.tests import DocumentTestMixin +from mayan.apps.common.tests import BaseTestCase +from mayan.apps.documents.permissions import permission_document_view +from mayan.apps.documents.search import document_search, document_page_search +from mayan.apps.documents.tests import DocumentTestMixin @override_settings(OCR_AUTO_OCR=False) diff --git a/mayan/apps/documents/tests/test_utils.py b/mayan/apps/documents/tests/test_utils.py index 8ea97d5079..1484282931 100644 --- a/mayan/apps/documents/tests/test_utils.py +++ b/mayan/apps/documents/tests/test_utils.py @@ -1,6 +1,6 @@ from __future__ import unicode_literals -from common.tests import BaseTestCase +from mayan.apps.common.tests import BaseTestCase from ..utils import parse_range diff --git a/mayan/apps/documents/views/document_page_views.py b/mayan/apps/documents/views/document_page_views.py index fb99f928c2..b1f02793e8 100644 --- a/mayan/apps/documents/views/document_page_views.py +++ b/mayan/apps/documents/views/document_page_views.py @@ -11,10 +11,10 @@ from django.utils.six.moves.urllib.parse import parse_qs, urlparse from django.utils.translation import ugettext_lazy as _ from django.views.generic import RedirectView -from acls.models import AccessControlList -from common.generics import SimpleView, SingleObjectListView -from common.utils import resolve -from converter.literals import DEFAULT_ROTATION, DEFAULT_ZOOM_LEVEL +from mayan.apps.acls.models import AccessControlList +from mayan.apps.common.generics import SimpleView, SingleObjectListView +from mayan.apps.common.utils import resolve +from mayan.apps.converter.literals import DEFAULT_ROTATION, DEFAULT_ZOOM_LEVEL from ..forms import DocumentPageForm from ..models import Document, DocumentPage diff --git a/mayan/apps/documents/views/document_type_views.py b/mayan/apps/documents/views/document_type_views.py index d7810b1ca6..a2b05bc64f 100644 --- a/mayan/apps/documents/views/document_type_views.py +++ b/mayan/apps/documents/views/document_type_views.py @@ -7,8 +7,8 @@ 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.generics import ( +from mayan.apps.acls.models import AccessControlList +from mayan.apps.common.generics import ( SingleObjectCreateView, SingleObjectDeleteView, SingleObjectEditView, SingleObjectListView ) diff --git a/mayan/apps/documents/views/document_version_views.py b/mayan/apps/documents/views/document_version_views.py index f54471c3e8..1d456bc68a 100644 --- a/mayan/apps/documents/views/document_version_views.py +++ b/mayan/apps/documents/views/document_version_views.py @@ -6,8 +6,8 @@ from django.contrib import messages from django.shortcuts import get_object_or_404 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, SingleObjectDetailView, SingleObjectListView ) diff --git a/mayan/apps/documents/views/document_views.py b/mayan/apps/documents/views/document_views.py index 2dacedaf00..79291a3e88 100644 --- a/mayan/apps/documents/views/document_views.py +++ b/mayan/apps/documents/views/document_views.py @@ -10,18 +10,18 @@ from django.urls import reverse, reverse_lazy from django.utils.http import urlencode from django.utils.translation import ugettext_lazy as _, ungettext -from acls.models import AccessControlList -from common.compressed_files import ZipArchive -from common.exceptions import ActionError -from common.generics import ( +from mayan.apps.acls.models import AccessControlList +from mayan.apps.common.compressed_files import ZipArchive +from mayan.apps.common.exceptions import ActionError +from mayan.apps.common.generics import ( ConfirmView, FormView, MultipleObjectConfirmActionView, MultipleObjectFormActionView, SingleObjectDetailView, SingleObjectDownloadView, SingleObjectEditView, SingleObjectListView ) -from common.mixins import MultipleInstanceActionMixin -from common.utils import encapsulate -from converter.models import Transformation -from converter.permissions import ( +from mayan.apps.common.mixins import MultipleInstanceActionMixin +from mayan.apps.common.utils import encapsulate +from mayan.apps.converter.models import Transformation +from mayan.apps.converter.permissions import ( permission_transformation_delete, permission_transformation_edit ) diff --git a/mayan/apps/documents/views/misc_views.py b/mayan/apps/documents/views/misc_views.py index 741acd5677..482dd15e84 100644 --- a/mayan/apps/documents/views/misc_views.py +++ b/mayan/apps/documents/views/misc_views.py @@ -5,7 +5,7 @@ import logging from django.contrib import messages from django.utils.translation import ugettext_lazy as _ -from common.generics import ConfirmView +from mayan.apps.common.generics import ConfirmView from ..permissions import permission_document_tools from ..tasks import task_clear_image_cache, task_scan_duplicates_all diff --git a/mayan/apps/dynamic_search/__init__.py b/mayan/apps/dynamic_search/__init__.py index 3a351a2bf7..74fb202e1e 100644 --- a/mayan/apps/dynamic_search/__init__.py +++ b/mayan/apps/dynamic_search/__init__.py @@ -1,3 +1,3 @@ from __future__ import unicode_literals -default_app_config = 'dynamic_search.apps.DynamicSearchApp' +default_app_config = 'mayan.apps.dynamic_search.apps.DynamicSearchApp' diff --git a/mayan/apps/dynamic_search/api_views.py b/mayan/apps/dynamic_search/api_views.py index 7128dd4289..61530d7ee2 100644 --- a/mayan/apps/dynamic_search/api_views.py +++ b/mayan/apps/dynamic_search/api_views.py @@ -5,7 +5,7 @@ from django.utils.encoding import force_text from rest_framework import generics from rest_framework.exceptions import ParseError -from rest_api.filters import MayanObjectPermissionsFilter +from mayan.apps.rest_api.filters import MayanObjectPermissionsFilter from .classes import SearchModel from .mixins import SearchModelMixin diff --git a/mayan/apps/dynamic_search/apps.py b/mayan/apps/dynamic_search/apps.py index 2527c7375c..fdd1008fc3 100644 --- a/mayan/apps/dynamic_search/apps.py +++ b/mayan/apps/dynamic_search/apps.py @@ -2,7 +2,7 @@ from __future__ import unicode_literals from django.utils.translation import ugettext_lazy as _ -from common import MayanAppConfig, menu_facet, menu_sidebar +from mayan.apps.common import MayanAppConfig, menu_facet, menu_sidebar from .links import link_search, link_search_advanced, link_search_again @@ -12,7 +12,7 @@ class DynamicSearchApp(MayanAppConfig): app_url = 'search' has_rest_api = True has_tests = True - name = 'dynamic_search' + name = 'mayan.apps.dynamic_search' verbose_name = _('Dynamic search') def ready(self): diff --git a/mayan/apps/dynamic_search/icons.py b/mayan/apps/dynamic_search/icons.py index 7651778409..6c56110ca2 100644 --- a/mayan/apps/dynamic_search/icons.py +++ b/mayan/apps/dynamic_search/icons.py @@ -1,5 +1,5 @@ from __future__ import absolute_import, unicode_literals -from appearance.classes import Icon +from mayan.apps.appearance.classes import Icon icon_search_submit = Icon(driver_name='fontawesome', symbol='search') diff --git a/mayan/apps/dynamic_search/links.py b/mayan/apps/dynamic_search/links.py index 9c3b01ce5f..4ef031a533 100644 --- a/mayan/apps/dynamic_search/links.py +++ b/mayan/apps/dynamic_search/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 link_search = Link( text=_('Search'), view='search:search', args='search_model.get_full_name' diff --git a/mayan/apps/dynamic_search/settings.py b/mayan/apps/dynamic_search/settings.py index 3c5a8dbb89..e3e3dd928c 100644 --- a/mayan/apps/dynamic_search/settings.py +++ b/mayan/apps/dynamic_search/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='dynamic_search', label=_('Search')) diff --git a/mayan/apps/dynamic_search/tests/test_api.py b/mayan/apps/dynamic_search/tests/test_api.py index 7628795063..20da76e806 100644 --- a/mayan/apps/dynamic_search/tests/test_api.py +++ b/mayan/apps/dynamic_search/tests/test_api.py @@ -5,10 +5,10 @@ from django.urls import reverse from rest_framework import status -from documents.search import document_search -from documents.permissions import permission_document_view -from documents.tests import DocumentTestMixin -from rest_api.tests import BaseAPITestCase +from mayan.apps.documents.search import document_search +from mayan.apps.documents.permissions import permission_document_view +from mayan.apps.documents.tests import DocumentTestMixin +from mayan.apps.rest_api.tests import BaseAPITestCase from ..classes import SearchModel diff --git a/mayan/apps/dynamic_search/tests/test_models.py b/mayan/apps/dynamic_search/tests/test_models.py index 1cdc55e2c1..3b6254c7b2 100644 --- a/mayan/apps/dynamic_search/tests/test_models.py +++ b/mayan/apps/dynamic_search/tests/test_models.py @@ -2,9 +2,9 @@ from __future__ import unicode_literals from django.test import override_settings -from common.tests import BaseTestCase -from documents.search import document_search -from documents.tests import ( +from mayan.apps.common.tests import BaseTestCase +from mayan.apps.documents.search import document_search +from mayan.apps.documents.tests import ( DocumentTestMixin, TEST_DOCUMENT_FILENAME, TEST_SMALL_DOCUMENT_FILENAME ) diff --git a/mayan/apps/dynamic_search/tests/test_views.py b/mayan/apps/dynamic_search/tests/test_views.py index 7ab2ffb5b7..30299bca97 100644 --- a/mayan/apps/dynamic_search/tests/test_views.py +++ b/mayan/apps/dynamic_search/tests/test_views.py @@ -2,10 +2,10 @@ from __future__ import unicode_literals from django.test import override_settings -from common.tests import GenericViewTestCase -from documents.models import DocumentType -from documents.search import document_search -from documents.tests import TEST_DOCUMENT_TYPE_LABEL, TEST_SMALL_DOCUMENT_PATH +from mayan.apps.common.tests import GenericViewTestCase +from mayan.apps.documents.models import DocumentType +from mayan.apps.documents.search import document_search +from mayan.apps.documents.tests import TEST_DOCUMENT_TYPE_LABEL, TEST_SMALL_DOCUMENT_PATH @override_settings(OCR_AUTO_OCR=False) diff --git a/mayan/apps/dynamic_search/views.py b/mayan/apps/dynamic_search/views.py index f453e4c076..1d1e9027ed 100644 --- a/mayan/apps/dynamic_search/views.py +++ b/mayan/apps/dynamic_search/views.py @@ -6,7 +6,7 @@ from django.urls import reverse from django.utils.translation import ugettext_lazy as _ from django.views.generic.base import RedirectView -from common.generics import SimpleView, SingleObjectListView +from mayan.apps.common.generics import SimpleView, SingleObjectListView from .forms import SearchForm, AdvancedSearchForm from .icons import icon_search_submit diff --git a/mayan/apps/events/__init__.py b/mayan/apps/events/__init__.py index d4884e06cb..afccd949a6 100644 --- a/mayan/apps/events/__init__.py +++ b/mayan/apps/events/__init__.py @@ -2,4 +2,4 @@ from __future__ import unicode_literals from .classes import EventTypeNamespace, ModelEventType # NOQA -default_app_config = 'events.apps.EventsApp' +default_app_config = 'mayan.apps.events.apps.EventsApp' diff --git a/mayan/apps/events/api_views.py b/mayan/apps/events/api_views.py index 28801c1ae9..c5513f0ff3 100644 --- a/mayan/apps/events/api_views.py +++ b/mayan/apps/events/api_views.py @@ -7,8 +7,8 @@ from django.shortcuts import get_object_or_404 from actstream.models import Action, any_stream from rest_framework import generics -from acls.models import AccessControlList -from rest_api.permissions import MayanPermission +from mayan.apps.acls.models import AccessControlList +from mayan.apps.rest_api.permissions import MayanPermission from .classes import EventType, EventTypeNamespace from .models import Notification diff --git a/mayan/apps/events/apps.py b/mayan/apps/events/apps.py index 5ce49c5b46..0e1d7539de 100644 --- a/mayan/apps/events/apps.py +++ b/mayan/apps/events/apps.py @@ -4,12 +4,12 @@ from django.apps import apps from django.contrib.auth import get_user_model from django.utils.translation import ugettext_lazy as _ -from common import ( +from mayan.apps.common import ( MayanAppConfig, menu_list_facet, menu_main, menu_object, menu_secondary, menu_tools, menu_user ) -from common.widgets import TwoStateWidget -from navigation import SourceColumn +from mayan.apps.common.widgets import TwoStateWidget +from mayan.apps.navigation import SourceColumn from .links import ( link_events_list, link_event_types_subscriptions_list, @@ -21,9 +21,11 @@ from .widgets import event_object_link, event_type_link, event_user_link class EventsApp(MayanAppConfig): + app_namespace = 'events' + app_url = 'events' has_rest_api = True has_tests = True - name = 'events' + name = 'mayan.apps.events' verbose_name = _('Events') def ready(self): diff --git a/mayan/apps/events/icons.py b/mayan/apps/events/icons.py index e508b61654..ecac8f3c1d 100644 --- a/mayan/apps/events/icons.py +++ b/mayan/apps/events/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_event_types_subscriptions_list = Icon( driver_name='fontawesome', symbol='list-ol' diff --git a/mayan/apps/events/licenses.py b/mayan/apps/events/licenses.py index 4ea6e2d0f6..e2b1976fae 100644 --- a/mayan/apps/events/licenses.py +++ b/mayan/apps/events/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='django-activity-stream', license_text=''' Copyright (c) 2010-2015, Justin Quick diff --git a/mayan/apps/events/links.py b/mayan/apps/events/links.py index b74a473ba6..f7e0394ce9 100644 --- a/mayan/apps/events/links.py +++ b/mayan/apps/events/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_events_list, icon_events_for_object, diff --git a/mayan/apps/events/permissions.py b/mayan/apps/events/permissions.py index f0f7a01eff..92df60d901 100644 --- a/mayan/apps/events/permissions.py +++ b/mayan/apps/events/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('events', _('Events')) permission_events_view = namespace.add_permission( diff --git a/mayan/apps/events/serializers.py b/mayan/apps/events/serializers.py index 3f2c7d8e20..c15a853bd8 100644 --- a/mayan/apps/events/serializers.py +++ b/mayan/apps/events/serializers.py @@ -6,9 +6,9 @@ from actstream.models import Action from rest_framework import serializers from rest_framework.reverse import reverse -from common.serializers import ContentTypeSerializer -from rest_api.fields import DynamicSerializerField -from user_management.serializers import UserSerializer +from mayan.apps.common.serializers import ContentTypeSerializer +from mayan.apps.rest_api.fields import DynamicSerializerField +from mayan.apps.user_management.serializers import UserSerializer from .classes import EventType from .models import Notification, StoredEventType diff --git a/mayan/apps/events/tests/test_api.py b/mayan/apps/events/tests/test_api.py index 11e66206d3..b11e6e85e0 100644 --- a/mayan/apps/events/tests/test_api.py +++ b/mayan/apps/events/tests/test_api.py @@ -2,7 +2,7 @@ from __future__ import unicode_literals from django.urls import reverse -from rest_api.tests import BaseAPITestCase +from mayan.apps.rest_api.tests import BaseAPITestCase class EventAPITestCase(BaseAPITestCase): diff --git a/mayan/apps/events/tests/test_views.py b/mayan/apps/events/tests/test_views.py index 1aa0beec89..c7bad2f229 100644 --- a/mayan/apps/events/tests/test_views.py +++ b/mayan/apps/events/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 ..permissions import permission_events_view diff --git a/mayan/apps/events/views.py b/mayan/apps/events/views.py index 662cce7926..a596736ca3 100644 --- a/mayan/apps/events/views.py +++ b/mayan/apps/events/views.py @@ -11,10 +11,10 @@ from django.utils.translation import ugettext_lazy as _ from actstream.models import Action, any_stream -from acls.models import AccessControlList -from common.generics import FormView, SimpleView -from common.utils import encapsulate -from common.views import SingleObjectListView +from mayan.apps.acls.models import AccessControlList +from mayan.apps.common.generics import FormView, SimpleView +from mayan.apps.common.utils import encapsulate +from mayan.apps.common.views import SingleObjectListView from .classes import EventType, ModelEventType from .forms import ( diff --git a/mayan/apps/linking/__init__.py b/mayan/apps/linking/__init__.py index 1324627d23..c6eb1f042c 100644 --- a/mayan/apps/linking/__init__.py +++ b/mayan/apps/linking/__init__.py @@ -1,3 +1,3 @@ from __future__ import unicode_literals -default_app_config = 'linking.apps.LinkingApp' +default_app_config = 'mayan.apps.linking.apps.LinkingApp' diff --git a/mayan/apps/linking/api_views.py b/mayan/apps/linking/api_views.py index 26e7e74ff1..be474e8865 100644 --- a/mayan/apps/linking/api_views.py +++ b/mayan/apps/linking/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 -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 SmartLink from .permissions import ( diff --git a/mayan/apps/linking/apps.py b/mayan/apps/linking/apps.py index d8cf621aff..5bdd79b8c1 100644 --- a/mayan/apps/linking/apps.py +++ b/mayan/apps/linking/apps.py @@ -3,15 +3,15 @@ from __future__ import unicode_literals from django.apps import apps 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_list_facet, menu_object, menu_secondary, menu_setup, menu_sidebar ) -from common.widgets import TwoStateWidget -from navigation import SourceColumn +from mayan.apps.common.widgets import TwoStateWidget +from mayan.apps.navigation import SourceColumn from .links import ( link_smart_link_create, link_smart_link_condition_create, @@ -28,9 +28,11 @@ from .permissions import ( class LinkingApp(MayanAppConfig): + app_namespace = 'linking' + app_url = 'smart_links' has_rest_api = True has_tests = True - name = 'linking' + name = 'mayan.apps.linking' verbose_name = _('Linking') def ready(self): diff --git a/mayan/apps/linking/forms.py b/mayan/apps/linking/forms.py index ce48a661ce..78ce42d758 100644 --- a/mayan/apps/linking/forms.py +++ b/mayan/apps/linking/forms.py @@ -4,8 +4,8 @@ from django import forms from django.utils.encoding import force_text from django.utils.translation import ugettext_lazy as _ -from common.classes import ModelField, ModelProperty -from documents.models import Document +from mayan.apps.common.classes import ModelField, ModelProperty +from mayan.apps.documents.models import Document from .models import SmartLink, SmartLinkCondition diff --git a/mayan/apps/linking/icons.py b/mayan/apps/linking/icons.py index 38722fe6b3..4f0774d21c 100644 --- a/mayan/apps/linking/icons.py +++ b/mayan/apps/linking/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_smart_link_condition_create = Icon( driver_name='fontawesome', symbol='plus' diff --git a/mayan/apps/linking/links.py b/mayan/apps/linking/links.py index 8c808d489f..a82cff8677 100644 --- a/mayan/apps/linking/links.py +++ b/mayan/apps/linking/links.py @@ -2,9 +2,9 @@ from __future__ import unicode_literals from django.utils.translation import ugettext_lazy as _ -from documents.icons import icon_document_type -from documents.permissions import permission_document_view -from navigation import Link +from mayan.apps.documents.icons import icon_document_type +from mayan.apps.documents.permissions import permission_document_view +from mayan.apps.navigation import Link from .icons import ( icon_smart_link_condition, icon_smart_link_condition_create, diff --git a/mayan/apps/linking/models.py b/mayan/apps/linking/models.py index 4781b6b947..77428dd596 100644 --- a/mayan/apps/linking/models.py +++ b/mayan/apps/linking/models.py @@ -7,7 +7,7 @@ from django.db.models import Q from django.utils.encoding import force_text, python_2_unicode_compatible from django.utils.translation import ugettext_lazy as _ -from documents.models import Document, DocumentType +from mayan.apps.documents.models import Document, DocumentType from .literals import ( INCLUSION_AND, INCLUSION_CHOICES, INCLUSION_OR, OPERATOR_CHOICES diff --git a/mayan/apps/linking/permissions.py b/mayan/apps/linking/permissions.py index 6c9882dfc5..9709dd6be4 100644 --- a/mayan/apps/linking/permissions.py +++ b/mayan/apps/linking/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('linking', _('Smart links')) diff --git a/mayan/apps/linking/serializers.py b/mayan/apps/linking/serializers.py index 3bc1b3ba50..03b18d0eb4 100644 --- a/mayan/apps/linking/serializers.py +++ b/mayan/apps/linking/serializers.py @@ -6,8 +6,10 @@ 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 DocumentSerializer, DocumentTypeSerializer +from mayan.apps.documents.models import DocumentType +from mayan.apps.documents.serializers import ( + DocumentSerializer, DocumentTypeSerializer +) from .models import SmartLink, SmartLinkCondition diff --git a/mayan/apps/linking/tests/test_api.py b/mayan/apps/linking/tests/test_api.py index 90fb862bc2..fa92ffdb83 100644 --- a/mayan/apps/linking/tests/test_api.py +++ b/mayan/apps/linking/tests/test_api.py @@ -4,13 +4,13 @@ from django.test import override_settings from rest_framework import status -from documents.models import DocumentType -from documents.permissions import permission_document_view -from documents.tests import DocumentTestMixin -from documents.tests.literals import ( +from mayan.apps.documents.models import DocumentType +from mayan.apps.documents.permissions import permission_document_view +from mayan.apps.documents.tests import DocumentTestMixin +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 SmartLink, SmartLinkCondition from ..permissions import ( diff --git a/mayan/apps/linking/tests/test_models.py b/mayan/apps/linking/tests/test_models.py index 23ad1326ba..9c91ef5d62 100644 --- a/mayan/apps/linking/tests/test_models.py +++ b/mayan/apps/linking/tests/test_models.py @@ -2,7 +2,7 @@ from __future__ import unicode_literals from django.test import override_settings -from documents.tests import GenericDocumentTestCase +from mayan.apps.documents.tests import GenericDocumentTestCase from ..models import SmartLink diff --git a/mayan/apps/linking/tests/test_views.py b/mayan/apps/linking/tests/test_views.py index b8b6fd4805..3efce0848a 100644 --- a/mayan/apps/linking/tests/test_views.py +++ b/mayan/apps/linking/tests/test_views.py @@ -1,7 +1,7 @@ from __future__ import absolute_import, unicode_literals -from documents.permissions import permission_document_view -from documents.tests import GenericDocumentViewTestCase +from mayan.apps.documents.permissions import permission_document_view +from mayan.apps.documents.tests import GenericDocumentViewTestCase from ..models import SmartLink from ..permissions import ( diff --git a/mayan/apps/linking/views.py b/mayan/apps/linking/views.py index 8ac26f451b..f7d99baa17 100644 --- a/mayan/apps/linking/views.py +++ b/mayan/apps/linking/views.py @@ -9,14 +9,14 @@ 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.generics import ( +from mayan.apps.acls.models import AccessControlList +from mayan.apps.common.generics import ( AssignRemoveView, 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 SmartLinkConditionForm, SmartLinkForm from .icons import icon_smart_link_setup, icon_smart_link_condition diff --git a/mayan/apps/lock_manager/__init__.py b/mayan/apps/lock_manager/__init__.py index c2d5d99bd3..436610b26c 100644 --- a/mayan/apps/lock_manager/__init__.py +++ b/mayan/apps/lock_manager/__init__.py @@ -2,4 +2,4 @@ from __future__ import unicode_literals from .exceptions import LockError # NOQA -default_app_config = 'lock_manager.apps.LockManagerApp' +default_app_config = 'mayan.apps.lock_manager.apps.LockManagerApp' diff --git a/mayan/apps/lock_manager/apps.py b/mayan/apps/lock_manager/apps.py index 27e11f8bd1..3a894b9540 100644 --- a/mayan/apps/lock_manager/apps.py +++ b/mayan/apps/lock_manager/apps.py @@ -6,5 +6,5 @@ from django.utils.translation import ugettext_lazy as _ class LockManagerApp(apps.AppConfig): has_tests = True - name = 'lock_manager' + name = 'mayan.apps.lock_manager' verbose_name = _('Lock manager') diff --git a/mayan/apps/lock_manager/backends/file_lock.py b/mayan/apps/lock_manager/backends/file_lock.py index 776d948c46..29e4b16f79 100644 --- a/mayan/apps/lock_manager/backends/file_lock.py +++ b/mayan/apps/lock_manager/backends/file_lock.py @@ -12,7 +12,7 @@ from django.conf import settings from django.core.files import locks from django.utils.encoding import force_bytes, force_text -from common.settings import setting_temporary_directory +from mayan.apps.common.settings import setting_temporary_directory from ..exceptions import LockError from ..settings import setting_default_lock_timeout diff --git a/mayan/apps/lock_manager/settings.py b/mayan/apps/lock_manager/settings.py index b13f1e286a..defbc79a99 100644 --- a/mayan/apps/lock_manager/settings.py +++ b/mayan/apps/lock_manager/settings.py @@ -2,9 +2,9 @@ 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 -DEFAULT_BACKEND = 'lock_manager.backends.file_lock.FileLock' +DEFAULT_BACKEND = 'mayan.apps.lock_manager.backends.file_lock.FileLock' DEFAULT_LOCK_TIMEOUT_VALUE = 30 namespace = Namespace(name='lock_manager', label=_('Lock manager')) diff --git a/mayan/apps/lock_manager/tests/test_backends.py b/mayan/apps/lock_manager/tests/test_backends.py index 005db749c0..97844c1207 100644 --- a/mayan/apps/lock_manager/tests/test_backends.py +++ b/mayan/apps/lock_manager/tests/test_backends.py @@ -11,7 +11,7 @@ TEST_LOCK_1 = 'test lock 1' class FileLockTestCase(TestCase): - backend_string = 'lock_manager.backends.file_lock.FileLock' + backend_string = 'mayan.apps.lock_manager.backends.file_lock.FileLock' def setUp(self): self.locking_backend = import_string(self.backend_string) @@ -71,4 +71,4 @@ class FileLockTestCase(TestCase): class ModelLockTestCase(FileLockTestCase): - backend_string = 'lock_manager.backends.model_lock.ModelLock' + backend_string = 'mayan.apps.lock_manager.backends.model_lock.ModelLock' diff --git a/mayan/apps/mailer/__init__.py b/mayan/apps/mailer/__init__.py index a4a9147d3b..1e8156d5fe 100644 --- a/mayan/apps/mailer/__init__.py +++ b/mayan/apps/mailer/__init__.py @@ -2,4 +2,4 @@ from __future__ import unicode_literals from .classes import * # NOQA -default_app_config = 'mailer.apps.MailerApp' +default_app_config = 'mayan.apps.mailer.apps.MailerApp' diff --git a/mayan/apps/mailer/apps.py b/mayan/apps/mailer/apps.py index 5e2f763d48..f83f14aed8 100644 --- a/mayan/apps/mailer/apps.py +++ b/mayan/apps/mailer/apps.py @@ -5,16 +5,16 @@ from kombu import Exchange, Queue from django.apps import apps 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_list_facet, menu_object, menu_multi_item, menu_secondary, menu_setup, menu_tools ) -from common.widgets import TwoStateWidget +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 MailerBackend from .links import ( @@ -33,8 +33,10 @@ from .queues import * # NOQA class MailerApp(MayanAppConfig): + app_namespace = 'mailer' + app_url = 'mailer' has_tests = True - name = 'mailer' + name = 'mayan.apps.mailer' verbose_name = _('Mailer') def ready(self): @@ -94,7 +96,7 @@ class MailerApp(MayanAppConfig): app.conf.CELERY_ROUTES.update( { - 'mailer.tasks.task_send_document': { + 'mayan.apps.mailer.tasks.task_send_document': { 'queue': 'mailing' }, } diff --git a/mayan/apps/mailer/classes.py b/mayan/apps/mailer/classes.py index dbfe07da99..df6b20ddc2 100644 --- a/mayan/apps/mailer/classes.py +++ b/mayan/apps/mailer/classes.py @@ -20,7 +20,7 @@ class MailerBackendMetaclass(type): new_class = super(MailerBackendMetaclass, mcs).__new__( mcs, name, bases, attrs ) - if not new_class.__module__ == 'mailer.classes': + if not new_class.__module__ == 'mayan.apps.mailer.classes': mcs._registry[ '{}.{}'.format(new_class.__module__, name) ] = new_class diff --git a/mayan/apps/mailer/forms.py b/mayan/apps/mailer/forms.py index eadedf15d6..4b3072c6fa 100644 --- a/mayan/apps/mailer/forms.py +++ b/mayan/apps/mailer/forms.py @@ -5,9 +5,9 @@ import json from django import forms from django.utils.translation import ugettext_lazy as _ -from acls.models import AccessControlList -from common.forms import DynamicModelForm -from common.settings import setting_project_title, setting_project_url +from mayan.apps.acls.models import AccessControlList +from mayan.apps.common.forms import DynamicModelForm +from mayan.apps.common.settings import setting_project_title, setting_project_url from .classes import MailerBackend from .models import UserMailer diff --git a/mayan/apps/mailer/icons.py b/mayan/apps/mailer/icons.py index d5c0eee448..86f56ea419 100644 --- a/mayan/apps/mailer/icons.py +++ b/mayan/apps/mailer/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_mail_document_submit = Icon( driver_name='fontawesome', symbol='envelope' diff --git a/mayan/apps/mailer/links.py b/mayan/apps/mailer/links.py index ff70be2f84..0db072ef4d 100644 --- a/mayan/apps/mailer/links.py +++ b/mayan/apps/mailer/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_system_mailer_error_log, icon_user_mailer_create, diff --git a/mayan/apps/mailer/permissions.py b/mayan/apps/mailer/permissions.py index 6356bef1df..fddd6f30b6 100644 --- a/mayan/apps/mailer/permissions.py +++ b/mayan/apps/mailer/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('mailing', _('Mailing')) diff --git a/mayan/apps/mailer/queues.py b/mayan/apps/mailer/queues.py index 1eb461cfd9..749c3b3b84 100644 --- a/mayan/apps/mailer/queues.py +++ b/mayan/apps/mailer/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_mailing = CeleryQueue( name='mailing', label=_('Mailing') ) queue_mailing.add_task_type( - name='mailer.tasks.task_send_document', + name='mayan.apps.mailer.tasks.task_send_document', label=_('Send document') ) diff --git a/mayan/apps/mailer/settings.py b/mayan/apps/mailer/settings.py index 6a36e766da..ce714d39ec 100644 --- a/mayan/apps/mailer/settings.py +++ b/mayan/apps/mailer/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_DOCUMENT_BODY_TEMPLATE, DEFAULT_LINK_BODY_TEMPLATE diff --git a/mayan/apps/mailer/tests/literals.py b/mayan/apps/mailer/tests/literals.py index ba3f97cd14..ae3b603355 100644 --- a/mayan/apps/mailer/tests/literals.py +++ b/mayan/apps/mailer/tests/literals.py @@ -15,5 +15,5 @@ TEST_RECIPIENTS_MULTIPLE_MIXED = 'test@example.com,test2@example.com;test2@examp TEST_RECIPIENTS_MULTIPLE_MIXED_RESULT = [ 'test@example.com', 'test2@example.com', 'test2@example.com' ] -TEST_USER_MAILER_BACKEND_PATH = 'mailer.tests.mailers.TestBackend' +TEST_USER_MAILER_BACKEND_PATH = 'mayan.apps.mailer.tests.mailers.TestBackend' TEST_USER_MAILER_LABEL = 'test user mailer label' diff --git a/mayan/apps/mailer/tests/test_models.py b/mayan/apps/mailer/tests/test_models.py index ea0cf0343b..0e98e7f88b 100644 --- a/mayan/apps/mailer/tests/test_models.py +++ b/mayan/apps/mailer/tests/test_models.py @@ -2,7 +2,7 @@ from __future__ import absolute_import, unicode_literals from django.core import mail -from documents.tests.test_models import GenericDocumentTestCase +from mayan.apps.documents.tests.test_models import GenericDocumentTestCase from .literals import ( TEST_BODY_HTML, TEST_EMAIL_ADDRESS, TEST_EMAIL_FROM_ADDRESS, diff --git a/mayan/apps/mailer/tests/test_views.py b/mayan/apps/mailer/tests/test_views.py index f24bdc454c..97f07b8e6f 100644 --- a/mayan/apps/mailer/tests/test_views.py +++ b/mayan/apps/mailer/tests/test_views.py @@ -2,7 +2,7 @@ from __future__ import unicode_literals from django.core import mail -from documents.tests import GenericDocumentViewTestCase +from mayan.apps.documents.tests import GenericDocumentViewTestCase from ..models import UserMailer from ..permissions import ( diff --git a/mayan/apps/mailer/views.py b/mayan/apps/mailer/views.py index fad6b82b7a..44cd09593c 100644 --- a/mayan/apps/mailer/views.py +++ b/mayan/apps/mailer/views.py @@ -7,13 +7,13 @@ from django.template import RequestContext from django.urls import reverse, reverse_lazy from django.utils.translation import ungettext, 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 ( FormView, MultipleObjectFormActionView, SingleObjectDeleteView, SingleObjectDynamicFormCreateView, SingleObjectDynamicFormEditView, SingleObjectListView ) -from documents.models import Document +from mayan.apps.documents.models import Document from .classes import MailerBackend from .forms import ( diff --git a/mayan/apps/mayan_statistics/__init__.py b/mayan/apps/mayan_statistics/__init__.py index 23d1ac4719..a12a494596 100644 --- a/mayan/apps/mayan_statistics/__init__.py +++ b/mayan/apps/mayan_statistics/__init__.py @@ -2,4 +2,4 @@ from __future__ import unicode_literals from .classes import StatisticLineChart, StatisticNamespace # NOQA -default_app_config = 'mayan_statistics.apps.StatisticsApp' +default_app_config = 'mayan.apps.mayan_statistics.apps.StatisticsApp' diff --git a/mayan/apps/mayan_statistics/apps.py b/mayan/apps/mayan_statistics/apps.py index 59aba2b30a..564bc1e593 100644 --- a/mayan/apps/mayan_statistics/apps.py +++ b/mayan/apps/mayan_statistics/apps.py @@ -4,10 +4,9 @@ from kombu import Exchange, Queue from django.utils.translation import ugettext_lazy as _ +from mayan.apps.common import MayanAppConfig, menu_object, menu_secondary, menu_tools +from mayan.apps.navigation import SourceColumn from mayan.celery import app -from common import MayanAppConfig, menu_object, menu_secondary, menu_tools - -from navigation import SourceColumn from .classes import StatisticLineChart, StatisticNamespace from .links import ( @@ -21,8 +20,9 @@ from .tasks import task_execute_statistic # NOQA - Force registration of task class StatisticsApp(MayanAppConfig): app_namespace = 'statistics' + app_url = 'statistics' has_tests = True - name = 'mayan_statistics' + name = 'mayan.apps.mayan_statistics' verbose_name = _('Statistics') def ready(self): @@ -47,7 +47,7 @@ class StatisticsApp(MayanAppConfig): app.conf.CELERY_ROUTES.update( { - 'mayan_statistics.tasks.task_execute_statistic': { + 'mayan.apps.mayan_statistics.tasks.task_execute_statistic': { 'queue': 'statistics' }, } diff --git a/mayan/apps/mayan_statistics/icons.py b/mayan/apps/mayan_statistics/icons.py index 9c0237384d..162dac3e6d 100644 --- a/mayan/apps/mayan_statistics/icons.py +++ b/mayan/apps/mayan_statistics/icons.py @@ -1,5 +1,5 @@ from __future__ import absolute_import, unicode_literals -from appearance.classes import Icon +from mayan.apps.appearance.classes import Icon icon_statistics = Icon(driver_name='fontawesome', symbol='sort-numeric-up') diff --git a/mayan/apps/mayan_statistics/licenses.py b/mayan/apps/mayan_statistics/licenses.py index a7cc3ad7d4..d06fe7d6cb 100644 --- a/mayan/apps/mayan_statistics/licenses.py +++ b/mayan/apps/mayan_statistics/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='Chart.js', license_text=''' Copyright (c) 2013-2015 Nick Downie diff --git a/mayan/apps/mayan_statistics/links.py b/mayan/apps/mayan_statistics/links.py index 2b9b678729..76a7e70e56 100644 --- a/mayan/apps/mayan_statistics/links.py +++ b/mayan/apps/mayan_statistics/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_statistics from .permissions import permission_statistics_view diff --git a/mayan/apps/mayan_statistics/permissions.py b/mayan/apps/mayan_statistics/permissions.py index a87d3ba6f3..6cd42d3361 100644 --- a/mayan/apps/mayan_statistics/permissions.py +++ b/mayan/apps/mayan_statistics/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('statistics', _('Statistics')) diff --git a/mayan/apps/mayan_statistics/queues.py b/mayan/apps/mayan_statistics/queues.py index 0bc0267473..f7a33a07ee 100644 --- a/mayan/apps/mayan_statistics/queues.py +++ b/mayan/apps/mayan_statistics/queues.py @@ -2,13 +2,13 @@ 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_statistics = CeleryQueue( name='statistics', label=_('Statistics'), transient=True ) queue_statistics.add_task_type( - name='mayan_statistics.tasks.task_execute_statistic', + name='mayan.apps.mayan_statistics.tasks.task_execute_statistic', label=_('Execute statistic') ) diff --git a/mayan/apps/mayan_statistics/tests/test_views.py b/mayan/apps/mayan_statistics/tests/test_views.py index 6bff2405b3..6f673f6493 100644 --- a/mayan/apps/mayan_statistics/tests/test_views.py +++ b/mayan/apps/mayan_statistics/tests/test_views.py @@ -1,6 +1,6 @@ from __future__ import unicode_literals -from common.tests import GenericViewTestCase +from mayan.apps.common.tests import GenericViewTestCase from ..classes import Statistic from ..permissions import permission_statistics_view diff --git a/mayan/apps/mayan_statistics/views.py b/mayan/apps/mayan_statistics/views.py index 583ca1bacf..1f8b3eae28 100644 --- a/mayan/apps/mayan_statistics/views.py +++ b/mayan/apps/mayan_statistics/views.py @@ -5,7 +5,7 @@ from django.http import Http404 from django.urls import reverse from django.utils.translation import ugettext_lazy as _ -from common.generics import ConfirmView, SimpleView, SingleObjectListView +from mayan.apps.common.generics import ConfirmView, SimpleView, SingleObjectListView from .classes import Statistic, StatisticNamespace from .permissions import permission_statistics_view diff --git a/mayan/apps/metadata/__init__.py b/mayan/apps/metadata/__init__.py index 4d087a736e..1c5fa25f71 100644 --- a/mayan/apps/metadata/__init__.py +++ b/mayan/apps/metadata/__init__.py @@ -2,4 +2,4 @@ from __future__ import unicode_literals from .classes import MetadataLookup # NOQA -default_app_config = 'metadata.apps.MetadataApp' +default_app_config = 'mayan.apps.metadata.apps.MetadataApp' diff --git a/mayan/apps/metadata/api_views.py b/mayan/apps/metadata/api_views.py index 89a6a2923e..ae9a2ab114 100644 --- a/mayan/apps/metadata/api_views.py +++ b/mayan/apps/metadata/api_views.py @@ -4,13 +4,13 @@ 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 ( +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, permission_document_type_edit ) -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 MetadataType from .permissions import ( diff --git a/mayan/apps/metadata/apps.py b/mayan/apps/metadata/apps.py index bb96df602b..05da7202a9 100644 --- a/mayan/apps/metadata/apps.py +++ b/mayan/apps/metadata/apps.py @@ -8,24 +8,24 @@ from django.apps import apps from django.db.models.signals import post_delete, post_save 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_list_facet, menu_multi_item, menu_object, menu_secondary, menu_setup, menu_sidebar ) -from common.classes import ModelAttribute, ModelField -from common.widgets import TwoStateWidget -from documents.search import document_page_search, document_search -from documents.signals import post_document_type_change -from events import ModelEventType -from events.links import ( +from mayan.apps.common.classes import ModelAttribute, ModelField +from mayan.apps.common.widgets import TwoStateWidget +from mayan.apps.documents.search import document_page_search, document_search +from mayan.apps.documents.signals import post_document_type_change +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.celery import app -from navigation import SourceColumn +from mayan.apps.navigation import SourceColumn from .classes import DocumentMetadataHelper from .events import ( @@ -61,9 +61,11 @@ logger = logging.getLogger(__name__) class MetadataApp(MayanAppConfig): + app_namespace = 'metadata' + app_url = 'metadata' has_rest_api = True has_tests = True - name = 'metadata' + name = 'mayan.apps.metadata' verbose_name = _('Metadata') def ready(self): @@ -175,10 +177,10 @@ class MetadataApp(MayanAppConfig): app.conf.CELERY_ROUTES.update( { - 'metadata.tasks.task_remove_metadata_type': { + 'mayan.apps.metadata.tasks.task_remove_metadata_type': { 'queue': 'metadata' }, - 'metadata.tasks.task_add_required_metadata_type': { + 'mayan.apps.metadata.tasks.task_add_required_metadata_type': { 'queue': 'metadata' }, } diff --git a/mayan/apps/metadata/classes.py b/mayan/apps/metadata/classes.py index d4a5128b0b..bbd15b89b5 100644 --- a/mayan/apps/metadata/classes.py +++ b/mayan/apps/metadata/classes.py @@ -1,6 +1,6 @@ from __future__ import unicode_literals -from common.classes import PropertyHelper +from mayan.apps.common.classes import PropertyHelper class DocumentMetadataHelper(PropertyHelper): diff --git a/mayan/apps/metadata/events.py b/mayan/apps/metadata/events.py index 85e9a77799..769eb07119 100644 --- a/mayan/apps/metadata/events.py +++ b/mayan/apps/metadata/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='metadata', label=_('Metadata')) diff --git a/mayan/apps/metadata/handlers.py b/mayan/apps/metadata/handlers.py index 10ba2fac90..f1e0c0cf65 100644 --- a/mayan/apps/metadata/handlers.py +++ b/mayan/apps/metadata/handlers.py @@ -4,7 +4,7 @@ from django.apps import apps import logging -from document_indexing.tasks import task_index_document +from mayan.apps.document_indexing.tasks import task_index_document from .tasks import task_add_required_metadata_type, task_remove_metadata_type diff --git a/mayan/apps/metadata/icons.py b/mayan/apps/metadata/icons.py index b8ef39ac00..dfc41d3bc1 100644 --- a/mayan/apps/metadata/icons.py +++ b/mayan/apps/metadata/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_metadata_add = Icon( driver_name='fontawesome', symbol='plus' diff --git a/mayan/apps/metadata/links.py b/mayan/apps/metadata/links.py index 3e646e09d2..dc6689bcdf 100644 --- a/mayan/apps/metadata/links.py +++ b/mayan/apps/metadata/links.py @@ -2,9 +2,9 @@ from __future__ import unicode_literals from django.utils.translation import ugettext_lazy as _ -from documents.icons import icon_document_type -from documents.permissions import permission_document_type_edit -from navigation import Link +from mayan.apps.documents.icons import icon_document_type +from mayan.apps.documents.permissions import permission_document_type_edit +from mayan.apps.navigation import Link from .icons import ( icon_document_metadata_add, icon_metadata_type, icon_metadata_view, diff --git a/mayan/apps/metadata/models.py b/mayan/apps/metadata/models.py index 98e2a9ead9..3d4499b45d 100644 --- a/mayan/apps/metadata/models.py +++ b/mayan/apps/metadata/models.py @@ -12,7 +12,7 @@ from django.utils.module_loading import import_string from django.utils.six import PY2 from django.utils.translation import ugettext_lazy as _ -from documents.models import Document, DocumentType +from mayan.apps.documents.models import Document, DocumentType from .classes import MetadataLookup from .events import ( diff --git a/mayan/apps/metadata/permissions.py b/mayan/apps/metadata/permissions.py index 90b74710c7..d39128ed60 100644 --- a/mayan/apps/metadata/permissions.py +++ b/mayan/apps/metadata/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('metadata', _('Metadata')) permission_metadata_document_edit = namespace.add_permission( diff --git a/mayan/apps/metadata/queues.py b/mayan/apps/metadata/queues.py index 94e714752b..16775657fb 100644 --- a/mayan/apps/metadata/queues.py +++ b/mayan/apps/metadata/queues.py @@ -2,16 +2,16 @@ 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_metadata = CeleryQueue( name='metadata', label=_('Metadata') ) queue_metadata.add_task_type( - name='metadata.tasks.task_remove_metadata_type', + name='mayan.apps.metadata.tasks.task_remove_metadata_type', label=_('Remove metadata type') ) queue_metadata.add_task_type( - name='metadata.tasks.task_add_required_metadata_type', + name='mayan.apps.metadata.tasks.task_add_required_metadata_type', label=_('Add required metadata type') ) diff --git a/mayan/apps/metadata/search.py b/mayan/apps/metadata/search.py index 685b4caae3..ba11ff1ca2 100644 --- a/mayan/apps/metadata/search.py +++ b/mayan/apps/metadata/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_metadata_type_view metadata_type_search = SearchModel( app_label='metadata', model_name='MetadataType', permission=permission_metadata_type_view, - serializer_string='metadata.serializers.MetadataTypeSerializer' + serializer_string='mayan.apps.metadata.serializers.MetadataTypeSerializer' ) metadata_type_search.add_model_field( diff --git a/mayan/apps/metadata/serializers.py b/mayan/apps/metadata/serializers.py index 0afcf95540..c611e55556 100644 --- a/mayan/apps/metadata/serializers.py +++ b/mayan/apps/metadata/serializers.py @@ -7,7 +7,9 @@ from rest_framework import serializers from rest_framework.exceptions import ValidationError from rest_framework.reverse import reverse -from documents.serializers import DocumentSerializer, DocumentTypeSerializer +from mayan.apps.documents.serializers import ( + DocumentSerializer, DocumentTypeSerializer +) from .models import DocumentMetadata, DocumentTypeMetadataType, MetadataType diff --git a/mayan/apps/metadata/settings.py b/mayan/apps/metadata/settings.py index 070b64737b..bb40bca391 100644 --- a/mayan/apps/metadata/settings.py +++ b/mayan/apps/metadata/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 .parsers import MetadataParser from .validators import MetadataValidator diff --git a/mayan/apps/metadata/tests/literals.py b/mayan/apps/metadata/tests/literals.py index feff034f88..678cfb9d87 100644 --- a/mayan/apps/metadata/tests/literals.py +++ b/mayan/apps/metadata/tests/literals.py @@ -2,8 +2,8 @@ from __future__ import unicode_literals TEST_CORRECT_LOOKUP_VALUE = '1' -TEST_DATE_PARSER = 'metadata.parsers.DateParser' -TEST_DATE_VALIDATOR = 'metadata.validators.DateValidator' +TEST_DATE_PARSER = 'mayan.apps.metadata.parsers.DateParser' +TEST_DATE_VALIDATOR = 'mayan.apps.metadata.validators.DateValidator' TEST_DOCUMENT_METADATA_VALUE_2 = 'test document metadata value 2' TEST_DEFAULT_VALUE = 'test' TEST_INCORRECT_LOOKUP_VALUE = '0' diff --git a/mayan/apps/metadata/tests/test_api.py b/mayan/apps/metadata/tests/test_api.py index 1bca004022..88470b1871 100644 --- a/mayan/apps/metadata/tests/test_api.py +++ b/mayan/apps/metadata/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 ( +from mayan.apps.documents.models import DocumentType +from mayan.apps.documents.permissions import ( permission_document_type_edit, permission_document_type_view ) -from documents.tests import TEST_DOCUMENT_TYPE_LABEL, TEST_SMALL_DOCUMENT_PATH -from rest_api.tests import BaseAPITestCase +from mayan.apps.documents.tests import TEST_DOCUMENT_TYPE_LABEL, TEST_SMALL_DOCUMENT_PATH +from mayan.apps.rest_api.tests import BaseAPITestCase from ..models import DocumentTypeMetadataType, MetadataType from ..permissions import ( diff --git a/mayan/apps/metadata/tests/test_events.py b/mayan/apps/metadata/tests/test_events.py index c1554ffd12..6c1611433a 100644 --- a/mayan/apps/metadata/tests/test_events.py +++ b/mayan/apps/metadata/tests/test_events.py @@ -2,7 +2,7 @@ from __future__ import unicode_literals from actstream.models import Action -from documents.tests import GenericDocumentViewTestCase +from mayan.apps.documents.tests import GenericDocumentViewTestCase from ..events import ( event_metadata_type_created, event_metadata_type_edited diff --git a/mayan/apps/metadata/tests/test_models.py b/mayan/apps/metadata/tests/test_models.py index 9dc63ab30d..61d2802a3c 100644 --- a/mayan/apps/metadata/tests/test_models.py +++ b/mayan/apps/metadata/tests/test_models.py @@ -4,9 +4,9 @@ from __future__ import unicode_literals from django.core.exceptions import ValidationError from django.test import override_settings -from common.tests import BaseTestCase -from documents.models import DocumentType -from documents.tests import DocumentTestMixin, TEST_DOCUMENT_TYPE_2_LABEL +from mayan.apps.common.tests import BaseTestCase +from mayan.apps.documents.models import DocumentType +from mayan.apps.documents.tests import DocumentTestMixin, TEST_DOCUMENT_TYPE_2_LABEL from ..models import DocumentMetadata diff --git a/mayan/apps/metadata/tests/test_views.py b/mayan/apps/metadata/tests/test_views.py index 033aa0f9cc..f45a89f898 100644 --- a/mayan/apps/metadata/tests/test_views.py +++ b/mayan/apps/metadata/tests/test_views.py @@ -4,13 +4,13 @@ import logging from django.core.files.base import File -from common.tests import GenericViewTestCase -from documents.models import DocumentType -from documents.permissions import ( +from mayan.apps.common.tests import GenericViewTestCase +from mayan.apps.documents.models import DocumentType +from mayan.apps.documents.permissions import ( permission_document_properties_edit, permission_document_type_edit, permission_document_view ) -from documents.tests import ( +from mayan.apps.documents.tests import ( DocumentTestMixin, GenericDocumentViewTestCase, TEST_DOCUMENT_TYPE_2_LABEL, TEST_SMALL_DOCUMENT_PATH, ) diff --git a/mayan/apps/metadata/tests/test_wizard_steps.py b/mayan/apps/metadata/tests/test_wizard_steps.py index a0cbfca898..045324a457 100644 --- a/mayan/apps/metadata/tests/test_wizard_steps.py +++ b/mayan/apps/metadata/tests/test_wizard_steps.py @@ -4,13 +4,13 @@ from furl import furl from django.urls import reverse -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, ) diff --git a/mayan/apps/metadata/views.py b/mayan/apps/metadata/views.py index f88ebdfe1f..a110dc7bdc 100644 --- a/mayan/apps/metadata/views.py +++ b/mayan/apps/metadata/views.py @@ -11,13 +11,13 @@ from django.utils.encoding import force_text from django.utils.http import urlencode from django.utils.translation import ugettext_lazy as _, ungettext -from acls.models import AccessControlList -from common.generics import ( +from mayan.apps.acls.models import AccessControlList +from mayan.apps.common.generics import ( FormView, MultipleObjectFormActionView, SingleObjectCreateView, SingleObjectDeleteView, SingleObjectEditView, SingleObjectListView ) -from documents.models import Document, DocumentType -from documents.permissions import ( +from mayan.apps.documents.models import Document, DocumentType +from mayan.apps.documents.permissions import ( permission_document_type_edit ) diff --git a/mayan/apps/metadata/wizard_steps.py b/mayan/apps/metadata/wizard_steps.py index e8feedee85..0d76500fb0 100644 --- a/mayan/apps/metadata/wizard_steps.py +++ b/mayan/apps/metadata/wizard_steps.py @@ -2,12 +2,12 @@ from __future__ import unicode_literals from django.utils.translation import ugettext_lazy as _ -from metadata.api import ( +from mayan.apps.metadata.api import ( decode_metadata_from_querystring, save_metadata_list ) -from metadata.forms import DocumentMetadataFormSet +from mayan.apps.metadata.forms import DocumentMetadataFormSet -from sources.wizards import WizardStep, WizardStepDocumentType +from mayan.apps.sources.wizards import WizardStep, WizardStepDocumentType class WizardStepMetadata(WizardStep): diff --git a/mayan/apps/mimetype/__init__.py b/mayan/apps/mimetype/__init__.py index 9341e339ed..2b39407f7e 100644 --- a/mayan/apps/mimetype/__init__.py +++ b/mayan/apps/mimetype/__init__.py @@ -1,3 +1,3 @@ from __future__ import unicode_literals -default_app_config = 'mimetype.apps.MIMETypesApp' +default_app_config = 'mayan.apps.mimetype.apps.MIMETypesApp' diff --git a/mayan/apps/mimetype/apps.py b/mayan/apps/mimetype/apps.py index 9aedf1a23d..58ce31c96c 100644 --- a/mayan/apps/mimetype/apps.py +++ b/mayan/apps/mimetype/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 MIMETypesApp(MayanAppConfig): - name = 'mimetype' + name = 'mayan.apps.mimetype' verbose_name = _('MIME types') def ready(self, *args, **kwargs): diff --git a/mayan/apps/mimetype/licenses.py b/mayan/apps/mimetype/licenses.py index 2574cb4d4e..7e21833710 100644 --- a/mayan/apps/mimetype/licenses.py +++ b/mayan/apps/mimetype/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='python-magic', license_text=''' The MIT License (MIT) diff --git a/mayan/apps/mirroring/__init__.py b/mayan/apps/mirroring/__init__.py index f4cda50ec7..415c39ebb8 100644 --- a/mayan/apps/mirroring/__init__.py +++ b/mayan/apps/mirroring/__init__.py @@ -1,3 +1,3 @@ from __future__ import unicode_literals -default_app_config = 'mirroring.apps.MirroringApp' +default_app_config = 'mayan.apps.mirroring.apps.MirroringApp' diff --git a/mayan/apps/mirroring/apps.py b/mayan/apps/mirroring/apps.py index 5dc800661a..e0594bec7b 100644 --- a/mayan/apps/mirroring/apps.py +++ b/mayan/apps/mirroring/apps.py @@ -4,14 +4,14 @@ from django.apps import apps from django.db.models.signals import pre_delete, pre_save from django.utils.translation import ugettext_lazy as _ -from common.apps import MayanAppConfig +from mayan.apps.common.apps import MayanAppConfig from .handlers import handler_document_cache_delete, handler_node_cache_delete class MirroringApp(MayanAppConfig): has_tests = True - name = 'mirroring' + name = 'mayan.apps.mirroring' verbose_name = _('Mirroring') def ready(self): diff --git a/mayan/apps/mirroring/filesystems.py b/mayan/apps/mirroring/filesystems.py index 0a42e788ab..5041bc1363 100644 --- a/mayan/apps/mirroring/filesystems.py +++ b/mayan/apps/mirroring/filesystems.py @@ -11,8 +11,8 @@ from fuse import FuseOSError, Operations from django.core.exceptions import MultipleObjectsReturned from django.db.models import Count, F, Func, Transform, Value -from document_indexing.models import Index, IndexInstanceNode -from documents.models import Document +from mayan.apps.document_indexing.models import Index, IndexInstanceNode +from mayan.apps.documents.models import Document from .literals import ( MAX_FILE_DESCRIPTOR, MIN_FILE_DESCRIPTOR, FILE_MODE, DIRECTORY_MODE diff --git a/mayan/apps/mirroring/settings.py b/mayan/apps/mirroring/settings.py index a1a8128302..7efd11a058 100644 --- a/mayan/apps/mirroring/settings.py +++ b/mayan/apps/mirroring/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='mirroring', label=_('Mirroring')) diff --git a/mayan/apps/mirroring/tests/test_caches.py b/mayan/apps/mirroring/tests/test_caches.py index 7d36d04fb4..f739b6301f 100644 --- a/mayan/apps/mirroring/tests/test_caches.py +++ b/mayan/apps/mirroring/tests/test_caches.py @@ -2,7 +2,7 @@ from __future__ import absolute_import, unicode_literals import warnings -from common.tests import BaseTestCase +from mayan.apps.common.tests import BaseTestCase from ..caches import IndexFilesystemCache diff --git a/mayan/apps/mirroring/tests/test_filesystems.py b/mayan/apps/mirroring/tests/test_filesystems.py index 1ad00c59db..a4f4676256 100644 --- a/mayan/apps/mirroring/tests/test_filesystems.py +++ b/mayan/apps/mirroring/tests/test_filesystems.py @@ -6,11 +6,10 @@ from fuse import FuseOSError from django.test import override_settings -from common.tests import BaseTestCase -from documents.models import Document -from documents.tests import DocumentTestMixin - -from document_indexing.tests import DocumentIndexingTestMixin +from mayan.apps.common.tests import BaseTestCase +from mayan.apps.documents.models import Document +from mayan.apps.documents.tests import DocumentTestMixin +from mayan.apps.document_indexing.tests import DocumentIndexingTestMixin from ..filesystems import IndexFilesystem diff --git a/mayan/apps/motd/__init__.py b/mayan/apps/motd/__init__.py index 71e348ee1d..5ca9dedd3e 100644 --- a/mayan/apps/motd/__init__.py +++ b/mayan/apps/motd/__init__.py @@ -1,3 +1,3 @@ from __future__ import unicode_literals -default_app_config = 'motd.apps.MOTDApp' +default_app_config = 'mayan.apps.motd.apps.MOTDApp' diff --git a/mayan/apps/motd/api_views.py b/mayan/apps/motd/api_views.py index a20d1f60d8..0dba8b92a4 100644 --- a/mayan/apps/motd/api_views.py +++ b/mayan/apps/motd/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 Message from .permissions import ( diff --git a/mayan/apps/motd/apps.py b/mayan/apps/motd/apps.py index 4efdff5ae8..a660006d8c 100644 --- a/mayan/apps/motd/apps.py +++ b/mayan/apps/motd/apps.py @@ -4,13 +4,13 @@ import logging 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_list_facet, menu_object, menu_secondary, menu_setup ) -from navigation import SourceColumn +from mayan.apps.navigation import SourceColumn from .links import ( link_message_create, link_message_delete, link_message_edit, @@ -25,9 +25,11 @@ logger = logging.getLogger(__name__) class MOTDApp(MayanAppConfig): + app_namespace = 'motd' + app_url = 'messages' has_rest_api = True has_tests = True - name = 'motd' + name = 'mayan.apps.motd' verbose_name = _('Message of the day') def ready(self): diff --git a/mayan/apps/motd/icons.py b/mayan/apps/motd/icons.py index d2f870a142..4a1681c28d 100644 --- a/mayan/apps/motd/icons.py +++ b/mayan/apps/motd/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_message_create = Icon(driver_name='fontawesome', symbol='plus') icon_message_list = Icon(driver_name='fontawesome', symbol='bullhorn') diff --git a/mayan/apps/motd/links.py b/mayan/apps/motd/links.py index 93429e3ba2..b0a8133baa 100644 --- a/mayan/apps/motd/links.py +++ b/mayan/apps/motd/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, get_cascade_condition +from mayan.apps.navigation import Link, get_cascade_condition from .icons import icon_message_create, icon_message_list from .permissions import ( diff --git a/mayan/apps/motd/permissions.py b/mayan/apps/motd/permissions.py index 61cc7e37c3..00b6e50611 100644 --- a/mayan/apps/motd/permissions.py +++ b/mayan/apps/motd/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('motd', _('Message of the day')) diff --git a/mayan/apps/motd/tests/test_api.py b/mayan/apps/motd/tests/test_api.py index d1170aea36..683282b7e1 100644 --- a/mayan/apps/motd/tests/test_api.py +++ b/mayan/apps/motd/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 Message from ..permissions import ( diff --git a/mayan/apps/motd/views.py b/mayan/apps/motd/views.py index 35ed3784e1..7899db6bf8 100644 --- a/mayan/apps/motd/views.py +++ b/mayan/apps/motd/views.py @@ -6,7 +6,7 @@ from django.template import RequestContext from django.urls import reverse_lazy from django.utils.translation import ugettext_lazy as _ -from common.views import ( +from mayan.apps.common.views import ( SingleObjectCreateView, SingleObjectDeleteView, SingleObjectEditView, SingleObjectListView ) diff --git a/mayan/apps/navigation/__init__.py b/mayan/apps/navigation/__init__.py index 76eca37938..33181082de 100644 --- a/mayan/apps/navigation/__init__.py +++ b/mayan/apps/navigation/__init__.py @@ -3,4 +3,4 @@ from __future__ import unicode_literals from .classes import Link, Menu, SourceColumn # NOQA from .utils import get_cascade_condition # NOQA -default_app_config = 'navigation.apps.NavigationApp' +default_app_config = 'mayan.apps.navigation.apps.NavigationApp' diff --git a/mayan/apps/navigation/apps.py b/mayan/apps/navigation/apps.py index c7289ffb0b..f8b6af391b 100644 --- a/mayan/apps/navigation/apps.py +++ b/mayan/apps/navigation/apps.py @@ -2,10 +2,10 @@ from __future__ import unicode_literals from django.utils.translation import ugettext_lazy as _ -from common.apps import MayanAppConfig +from mayan.apps.common.apps import MayanAppConfig class NavigationApp(MayanAppConfig): has_tests = True - name = 'navigation' + name = 'mayan.apps.navigation' verbose_name = _('Navigation') diff --git a/mayan/apps/navigation/classes.py b/mayan/apps/navigation/classes.py index 905b4bc652..96adafcbec 100644 --- a/mayan/apps/navigation/classes.py +++ b/mayan/apps/navigation/classes.py @@ -15,8 +15,8 @@ from django.template.defaulttags import URLNode from django.urls import Resolver404, resolve from django.utils.encoding import force_str, force_text -from common.utils import return_attrib -from permissions import Permission +from mayan.apps.common.utils import return_attrib +from mayan.apps.permissions import Permission logger = logging.getLogger(__name__) diff --git a/mayan/apps/navigation/tests/test_classes.py b/mayan/apps/navigation/tests/test_classes.py index f6e13bd772..bd14e0c4d1 100644 --- a/mayan/apps/navigation/tests/test_classes.py +++ b/mayan/apps/navigation/tests/test_classes.py @@ -5,10 +5,10 @@ from django.urls import reverse from furl import furl -from acls.models import AccessControlList -from common.tests import GenericViewTestCase -from common.tests.literals import TEST_VIEW_NAME -from permissions import Permission, PermissionNamespace +from mayan.apps.acls.models import AccessControlList +from mayan.apps.common.tests import GenericViewTestCase +from mayan.apps.common.tests.literals import TEST_VIEW_NAME +from mayan.apps.permissions import Permission, PermissionNamespace from ..classes import Link, Menu diff --git a/mayan/apps/navigation/utils.py b/mayan/apps/navigation/utils.py index 7600d22ad8..0d67993041 100644 --- a/mayan/apps/navigation/utils.py +++ b/mayan/apps/navigation/utils.py @@ -3,7 +3,7 @@ from __future__ import absolute_import, unicode_literals from django.apps import apps from django.core.exceptions import PermissionDenied -from permissions import Permission +from mayan.apps.permissions import Permission def get_cascade_condition(app_label, model_name, object_permission, view_permission=None): diff --git a/mayan/apps/ocr/__init__.py b/mayan/apps/ocr/__init__.py index e54626bf2d..f54a4bdac7 100644 --- a/mayan/apps/ocr/__init__.py +++ b/mayan/apps/ocr/__init__.py @@ -1,3 +1,3 @@ from __future__ import unicode_literals -default_app_config = 'ocr.apps.OCRApp' +default_app_config = 'mayan.apps.ocr.apps.OCRApp' diff --git a/mayan/apps/ocr/api_views.py b/mayan/apps/ocr/api_views.py index 4bd74a3aa8..fe6d17e8db 100644 --- a/mayan/apps/ocr/api_views.py +++ b/mayan/apps/ocr/api_views.py @@ -5,8 +5,8 @@ from django.shortcuts import get_object_or_404 from rest_framework import generics, status from rest_framework.response import Response -from documents.models import Document, DocumentVersion -from rest_api.permissions import MayanPermission +from mayan.apps.documents.models import Document, DocumentVersion +from mayan.apps.rest_api.permissions import MayanPermission from .models import DocumentPageOCRContent from .permissions import permission_ocr_content_view, permission_ocr_document diff --git a/mayan/apps/ocr/apps.py b/mayan/apps/ocr/apps.py index 3324f56885..764124d8da 100644 --- a/mayan/apps/ocr/apps.py +++ b/mayan/apps/ocr/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 ModelAttribute, 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 ModelAttribute, 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_ocr_document_version_submit from .handlers import ( @@ -67,9 +67,11 @@ def document_version_ocr_submit(self): class OCRApp(MayanAppConfig): + app_namespace = 'ocr' + app_url = 'ocr' has_rest_api = True has_tests = True - name = 'ocr' + name = 'mayan.apps.ocr' verbose_name = _('OCR') def ready(self): @@ -144,7 +146,7 @@ class OCRApp(MayanAppConfig): app.conf.CELERY_ROUTES.update( { - 'ocr.tasks.task_do_ocr': { + 'mayan.apps.ocr.tasks.task_do_ocr': { 'queue': 'ocr' }, } diff --git a/mayan/apps/ocr/classes.py b/mayan/apps/ocr/classes.py index 337098bff2..487f5994a3 100644 --- a/mayan/apps/ocr/classes.py +++ b/mayan/apps/ocr/classes.py @@ -1,6 +1,6 @@ from __future__ import unicode_literals -from converter import converter_class +from mayan.apps.converter import converter_class class OCRBackendBase(object): diff --git a/mayan/apps/ocr/events.py b/mayan/apps/ocr/events.py index cae9d83ae3..a77827bb47 100644 --- a/mayan/apps/ocr/events.py +++ b/mayan/apps/ocr/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='ocr', label=_('OCR')) diff --git a/mayan/apps/ocr/forms.py b/mayan/apps/ocr/forms.py index 9aef5501bf..7d1db5d942 100644 --- a/mayan/apps/ocr/forms.py +++ b/mayan/apps/ocr/forms.py @@ -6,8 +6,8 @@ from django.utils.html import conditional_escape from django.utils.safestring import mark_safe from django.utils.translation import ugettext_lazy as _, ugettext -from common.widgets import TextAreaDiv -from documents.models import DocumentType +from mayan.apps.common.widgets import TextAreaDiv +from mayan.apps.documents.models import DocumentType from .models import DocumentPageOCRContent diff --git a/mayan/apps/ocr/handlers.py b/mayan/apps/ocr/handlers.py index 706e3f6f81..60cdfcd0c5 100644 --- a/mayan/apps/ocr/handlers.py +++ b/mayan/apps/ocr/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_ocr diff --git a/mayan/apps/ocr/icons.py b/mayan/apps/ocr/icons.py index 492148feef..2390e22658 100644 --- a/mayan/apps/ocr/icons.py +++ b/mayan/apps/ocr/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_ocr_download = Icon( diff --git a/mayan/apps/ocr/links.py b/mayan/apps/ocr/links.py index 5ccfaf4c84..96de61322a 100644 --- a/mayan/apps/ocr/links.py +++ b/mayan/apps/ocr/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_content, icon_document_ocr_download, diff --git a/mayan/apps/ocr/managers.py b/mayan/apps/ocr/managers.py index c6723e1926..d03b0dc071 100644 --- a/mayan/apps/ocr/managers.py +++ b/mayan/apps/ocr/managers.py @@ -8,9 +8,9 @@ from django.apps import apps from django.conf import settings from django.db import models -from documents.storages import storage_documentimagecache -from documents.literals import DOCUMENT_IMAGE_TASK_TIMEOUT -from documents.tasks import task_generate_document_page_image +from mayan.apps.documents.storages import storage_documentimagecache +from mayan.apps.documents.literals import DOCUMENT_IMAGE_TASK_TIMEOUT +from mayan.apps.documents.tasks import task_generate_document_page_image from .events import event_ocr_document_version_finish from .runtime import ocr_backend diff --git a/mayan/apps/ocr/models.py b/mayan/apps/ocr/models.py index e06268f8f7..9f42843a7e 100644 --- a/mayan/apps/ocr/models.py +++ b/mayan/apps/ocr/models.py @@ -4,7 +4,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 documents.models import DocumentPage, DocumentType, DocumentVersion +from mayan.apps.documents.models import DocumentPage, DocumentType, DocumentVersion from .managers import ( DocumentPageOCRContentManager, DocumentTypeSettingsManager diff --git a/mayan/apps/ocr/permissions.py b/mayan/apps/ocr/permissions.py index 79e3ba75b6..669b932157 100644 --- a/mayan/apps/ocr/permissions.py +++ b/mayan/apps/ocr/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('ocr', _('OCR')) diff --git a/mayan/apps/ocr/queues.py b/mayan/apps/ocr/queues.py index 92297a2524..537dae91c1 100644 --- a/mayan/apps/ocr/queues.py +++ b/mayan/apps/ocr/queues.py @@ -2,9 +2,9 @@ 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='ocr', label=_('OCR')) queue_ocr.add_task_type( - name='ocr.tasks.task_do_ocr', label=_('Document version OCR') + name='mayan.apps.ocr.tasks.task_do_ocr', label=_('Document version OCR') ) diff --git a/mayan/apps/ocr/settings.py b/mayan/apps/ocr/settings.py index 9fd66fe2da..debf8be200 100644 --- a/mayan/apps/ocr/settings.py +++ b/mayan/apps/ocr/settings.py @@ -2,12 +2,12 @@ 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='ocr', label=_('OCR')) setting_ocr_backend = namespace.add_setting( - global_name='OCR_BACKEND', default='ocr.backends.pyocr.PyOCR', + global_name='OCR_BACKEND', default='mayan.apps.ocr.backends.pyocr.PyOCR', help_text=_('Full path to the backend to be used to do OCR.') ) setting_ocr_backend_arguments = namespace.add_setting( diff --git a/mayan/apps/ocr/tasks.py b/mayan/apps/ocr/tasks.py index 87294e5925..77b340e3f5 100644 --- a/mayan/apps/ocr/tasks.py +++ b/mayan/apps/ocr/tasks.py @@ -5,8 +5,8 @@ import logging from django.apps import apps from django.db import OperationalError -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 DO_OCR_RETRY_DELAY, LOCK_EXPIRE diff --git a/mayan/apps/ocr/tests/test_api.py b/mayan/apps/ocr/tests/test_api.py index 5c3c0bd286..4a092b694b 100644 --- a/mayan/apps/ocr/tests/test_api.py +++ b/mayan/apps/ocr/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 ..permissions import ( permission_ocr_document, permission_ocr_content_view, diff --git a/mayan/apps/ocr/tests/test_events.py b/mayan/apps/ocr/tests/test_events.py index c255fc843c..4ea851b18d 100644 --- a/mayan/apps/ocr/tests/test_events.py +++ b/mayan/apps/ocr/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_ocr_document_version_submit, event_ocr_document_version_finish diff --git a/mayan/apps/ocr/tests/test_indexing.py b/mayan/apps/ocr/tests/test_indexing.py index 79a9ad3bfb..b9f619971c 100644 --- a/mayan/apps/ocr/tests/test_indexing.py +++ b/mayan/apps/ocr/tests/test_indexing.py @@ -2,10 +2,10 @@ from __future__ import unicode_literals from django.test import override_settings -from common.tests import BaseTestCase -from documents.tests import DocumentTestMixin -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 +from mayan.apps.document_indexing.models import Index, IndexInstanceNode +from mayan.apps.document_indexing.tests.literals import TEST_INDEX_LABEL from .literals import ( TEST_OCR_INDEX_NODE_TEMPLATE, TEST_OCR_INDEX_NODE_TEMPLATE_LEVEL diff --git a/mayan/apps/ocr/tests/test_models.py b/mayan/apps/ocr/tests/test_models.py index ae805a2427..324ce44d61 100644 --- a/mayan/apps/ocr/tests/test_models.py +++ b/mayan/apps/ocr/tests/test_models.py @@ -2,10 +2,10 @@ from __future__ import unicode_literals -from common.tests import BaseTestCase -from documents.models import DocumentType -from documents.runtime import language_choices -from documents.tests import ( +from mayan.apps.common.tests import BaseTestCase +from mayan.apps.documents.models import DocumentType +from mayan.apps.documents.runtime import language_choices +from mayan.apps.documents.tests import ( DocumentTestMixin, TEST_DEU_DOCUMENT_PATH, TEST_DOCUMENT_TYPE_LABEL ) diff --git a/mayan/apps/ocr/tests/test_views.py b/mayan/apps/ocr/tests/test_views.py index 026ad158bd..4eca270c55 100644 --- a/mayan/apps/ocr/tests/test_views.py +++ b/mayan/apps/ocr/tests/test_views.py @@ -1,6 +1,6 @@ from __future__ import unicode_literals -from documents.tests import GenericDocumentViewTestCase +from mayan.apps.documents.tests import GenericDocumentViewTestCase from ..permissions import ( permission_ocr_content_view, permission_ocr_document, diff --git a/mayan/apps/ocr/views.py b/mayan/apps/ocr/views.py index a4de687a90..e6e3949d00 100644 --- a/mayan/apps/ocr/views.py +++ b/mayan/apps/ocr/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 ( DocumentPageOCRContentForm, DocumentOCRContentForm, diff --git a/mayan/apps/permissions/__init__.py b/mayan/apps/permissions/__init__.py index ed5919712b..7bc7e5377a 100644 --- a/mayan/apps/permissions/__init__.py +++ b/mayan/apps/permissions/__init__.py @@ -2,4 +2,4 @@ from __future__ import unicode_literals from .classes import Permission, PermissionNamespace # NOQA -default_app_config = 'permissions.apps.PermissionsApp' +default_app_config = 'mayan.apps.permissions.apps.PermissionsApp' diff --git a/mayan/apps/permissions/api_views.py b/mayan/apps/permissions/api_views.py index 8a284de162..fb23c78a00 100644 --- a/mayan/apps/permissions/api_views.py +++ b/mayan/apps/permissions/api_views.py @@ -2,8 +2,8 @@ from __future__ 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 .classes import Permission from .models import Role diff --git a/mayan/apps/permissions/apps.py b/mayan/apps/permissions/apps.py index 63a5834916..7e1a69b135 100644 --- a/mayan/apps/permissions/apps.py +++ b/mayan/apps/permissions/apps.py @@ -3,15 +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.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_list_facet, menu_multi_item, menu_object, menu_secondary, menu_setup ) -from common.signals import perform_upgrade +from mayan.apps.common.signals import perform_upgrade from .handlers import purge_permissions from .links import ( @@ -27,9 +26,11 @@ from .search import * # NOQA class PermissionsApp(MayanAppConfig): + app_namespace = 'permissions' + app_url = 'permissions' has_rest_api = True has_tests = True - name = 'permissions' + name = 'mayan.apps.permissions' verbose_name = _('Permissions') def ready(self): diff --git a/mayan/apps/permissions/icons.py b/mayan/apps/permissions/icons.py index 744f261099..c3c805ba59 100644 --- a/mayan/apps/permissions/icons.py +++ b/mayan/apps/permissions/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_permission = Icon(driver_name='fontawesome', symbol='thumbs-up') icon_role_create = Icon(driver_name='fontawesome', symbol='plus') diff --git a/mayan/apps/permissions/links.py b/mayan/apps/permissions/links.py index e626973ca0..c28a004954 100644 --- a/mayan/apps/permissions/links.py +++ b/mayan/apps/permissions/links.py @@ -2,9 +2,9 @@ from __future__ import unicode_literals from django.utils.translation import ugettext_lazy as _ -from navigation import Link -from user_management.icons import icon_group -from user_management.permissions import permission_group_edit +from mayan.apps.navigation import Link +from mayan.apps.user_management.icons import icon_group +from mayan.apps.user_management.permissions import permission_group_edit from .icons import icon_permission, icon_role_create, icon_role_list from .permissions import ( diff --git a/mayan/apps/permissions/search.py b/mayan/apps/permissions/search.py index 679f8dc9ba..21ac3f9c52 100644 --- a/mayan/apps/permissions/search.py +++ b/mayan/apps/permissions/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_role_view role_search = SearchModel( app_label='permissions', model_name='Role', permission=permission_role_view, - serializer_string='permissions.serializers.RoleSerializer' + serializer_string='mayan.apps.permissions.serializers.RoleSerializer' ) role_search.add_model_field( diff --git a/mayan/apps/permissions/serializers.py b/mayan/apps/permissions/serializers.py index b1ece06f7f..0a8d5e4e95 100644 --- a/mayan/apps/permissions/serializers.py +++ b/mayan/apps/permissions/serializers.py @@ -6,7 +6,7 @@ from django.utils.translation import ugettext_lazy as _ from rest_framework import serializers from rest_framework.exceptions import ValidationError -from user_management.serializers import GroupSerializer +from mayan.apps.user_management.serializers import GroupSerializer from .classes import Permission from .models import Role, StoredPermission diff --git a/mayan/apps/permissions/tests/test_api.py b/mayan/apps/permissions/tests/test_api.py index 6de0d27db0..e28fbdef5b 100644 --- a/mayan/apps/permissions/tests/test_api.py +++ b/mayan/apps/permissions/tests/test_api.py @@ -4,8 +4,8 @@ from django.contrib.auth.models import Group from rest_framework import status -from rest_api.tests import BaseAPITestCase -from user_management.tests.literals import TEST_GROUP_2_NAME +from mayan.apps.rest_api.tests import BaseAPITestCase +from mayan.apps.user_management.tests.literals import TEST_GROUP_2_NAME from ..classes import Permission from ..models import Role diff --git a/mayan/apps/permissions/tests/test_models.py b/mayan/apps/permissions/tests/test_models.py index 59587b0b46..5aef04dc79 100644 --- a/mayan/apps/permissions/tests/test_models.py +++ b/mayan/apps/permissions/tests/test_models.py @@ -2,7 +2,7 @@ from __future__ import unicode_literals from django.core.exceptions import PermissionDenied -from common.tests import BaseTestCase +from mayan.apps.common.tests import BaseTestCase from ..classes import Permission from ..permissions import permission_role_view diff --git a/mayan/apps/permissions/tests/test_views.py b/mayan/apps/permissions/tests/test_views.py index 3ed47361ee..851fdb482e 100644 --- a/mayan/apps/permissions/tests/test_views.py +++ b/mayan/apps/permissions/tests/test_views.py @@ -2,9 +2,9 @@ from __future__ import unicode_literals from django.contrib.auth.models import Group -from common.tests import GenericViewTestCase -from user_management.permissions import permission_group_edit -from user_management.tests.literals import TEST_GROUP_2_NAME +from mayan.apps.common.tests import GenericViewTestCase +from mayan.apps.user_management.permissions import permission_group_edit +from mayan.apps.user_management.tests.literals import TEST_GROUP_2_NAME from ..models import Role from ..permissions import ( diff --git a/mayan/apps/permissions/views.py b/mayan/apps/permissions/views.py index 5f39b2540e..fc6b9c3b70 100644 --- a/mayan/apps/permissions/views.py +++ b/mayan/apps/permissions/views.py @@ -9,12 +9,12 @@ from django.urls import reverse_lazy from django.utils.encoding import force_text 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, SingleObjectCreateView, SingleObjectDeleteView, SingleObjectEditView, SingleObjectListView ) -from user_management.permissions import permission_group_edit +from mayan.apps.user_management.permissions import permission_group_edit from .classes import Permission, PermissionNamespace from .icons import icon_role_list diff --git a/mayan/apps/rest_api/__init__.py b/mayan/apps/rest_api/__init__.py index eea7886b3a..0f5c529960 100644 --- a/mayan/apps/rest_api/__init__.py +++ b/mayan/apps/rest_api/__init__.py @@ -1,3 +1,3 @@ from __future__ import unicode_literals -default_app_config = 'rest_api.apps.RESTAPIApp' +default_app_config = 'mayan.apps.rest_api.apps.RESTAPIApp' diff --git a/mayan/apps/rest_api/apps.py b/mayan/apps/rest_api/apps.py index d3aadd1fb0..88d0b2c61a 100644 --- a/mayan/apps/rest_api/apps.py +++ b/mayan/apps/rest_api/apps.py @@ -5,7 +5,7 @@ from django.conf import settings from django.utils.module_loading import import_string from django.utils.translation import ugettext_lazy as _ -from common import MayanAppConfig, menu_tools +from mayan.apps.common import MayanAppConfig, menu_tools from .links import ( link_api, link_api_documentation, link_api_documentation_redoc @@ -15,7 +15,8 @@ from .licenses import * # NOQA class RESTAPIApp(MayanAppConfig): app_url = 'api' - name = 'rest_api' + app_namespace = 'rest_api' + name = 'mayan.apps.rest_api' verbose_name = _('REST API') def ready(self): @@ -31,5 +32,5 @@ class RESTAPIApp(MayanAppConfig): for app in apps.get_app_configs(): if getattr(app, 'has_rest_api', False): - app_api_urls = import_string('{}.urls.api_urls'.format(app.label)) + app_api_urls = import_string('{}.urls.api_urls'.format(app.name)) api_urls.extend(app_api_urls) diff --git a/mayan/apps/rest_api/filters.py b/mayan/apps/rest_api/filters.py index 845622fdb5..1b561c598e 100644 --- a/mayan/apps/rest_api/filters.py +++ b/mayan/apps/rest_api/filters.py @@ -2,7 +2,7 @@ from __future__ import absolute_import, unicode_literals from rest_framework.filters import BaseFilterBackend -from acls.models import AccessControlList +from mayan.apps.acls.models import AccessControlList class MayanObjectPermissionsFilter(BaseFilterBackend): diff --git a/mayan/apps/rest_api/icons.py b/mayan/apps/rest_api/icons.py index c6d1fc160f..c780852a71 100644 --- a/mayan/apps/rest_api/icons.py +++ b/mayan/apps/rest_api/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_api = Icon(driver_name='fontawesome', symbol='plug') icon_api_documentation = Icon(driver_name='fontawesome', symbol='book') diff --git a/mayan/apps/rest_api/licenses.py b/mayan/apps/rest_api/licenses.py index 4037ef8f7d..9fea5c228d 100644 --- a/mayan/apps/rest_api/licenses.py +++ b/mayan/apps/rest_api/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='Django REST framework', license_text=''' Copyright (c) 2011-2015, Tom Christie All rights reserved. diff --git a/mayan/apps/rest_api/links.py b/mayan/apps/rest_api/links.py index 8306c5b3e9..efd5443ab3 100644 --- a/mayan/apps/rest_api/links.py +++ b/mayan/apps/rest_api/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_api, icon_api_documentation, icon_api_documentation_redoc diff --git a/mayan/apps/rest_api/permissions.py b/mayan/apps/rest_api/permissions.py index cc518e38e4..88c37cd746 100644 --- a/mayan/apps/rest_api/permissions.py +++ b/mayan/apps/rest_api/permissions.py @@ -6,8 +6,8 @@ from django.core.exceptions import PermissionDenied from rest_framework.permissions import BasePermission -from acls.models import AccessControlList -from permissions import Permission +from mayan.apps.acls.models import AccessControlList +from mayan.apps.permissions import Permission class MayanPermission(BasePermission): diff --git a/mayan/apps/rest_api/schemas.py b/mayan/apps/rest_api/schemas.py index d0e8e5d963..89abc51b2a 100644 --- a/mayan/apps/rest_api/schemas.py +++ b/mayan/apps/rest_api/schemas.py @@ -4,8 +4,8 @@ from django.utils.translation import ugettext_lazy as _ from drf_yasg import openapi -from common.settings import setting_project_title import mayan +from mayan.apps.common.settings import setting_project_title openapi_info = openapi.Info( title=_('%s API') % setting_project_title.value, diff --git a/mayan/apps/rest_api/tests/base.py b/mayan/apps/rest_api/tests/base.py index 8fbe927250..de5696e17c 100644 --- a/mayan/apps/rest_api/tests/base.py +++ b/mayan/apps/rest_api/tests/base.py @@ -5,10 +5,10 @@ from django.urls import reverse from rest_framework.test import APITestCase -from common.tests.mixins import UserMixin -from permissions.classes import Permission -from smart_settings.classes import Namespace -from user_management.tests import ( +from mayan.apps.common.tests.mixins import UserMixin +from mayan.apps.permissions.classes import Permission +from mayan.apps.smart_settings.classes import Namespace +from mayan.apps.user_management.tests import ( TEST_ADMIN_PASSWORD, TEST_ADMIN_USERNAME, TEST_USER_USERNAME, TEST_USER_PASSWORD ) diff --git a/mayan/apps/smart_settings/__init__.py b/mayan/apps/smart_settings/__init__.py index f88029b412..143550fa7b 100644 --- a/mayan/apps/smart_settings/__init__.py +++ b/mayan/apps/smart_settings/__init__.py @@ -2,4 +2,4 @@ from __future__ import unicode_literals from .classes import Namespace, Setting # NOQA -default_app_config = 'smart_settings.apps.SmartSettingsApp' +default_app_config = 'mayan.apps.smart_settings.apps.SmartSettingsApp' diff --git a/mayan/apps/smart_settings/apps.py b/mayan/apps/smart_settings/apps.py index 188c45c9ee..afd7bcf040 100644 --- a/mayan/apps/smart_settings/apps.py +++ b/mayan/apps/smart_settings/apps.py @@ -2,11 +2,11 @@ from __future__ import unicode_literals from django.utils.translation import ugettext_lazy as _ -from common import ( +from mayan.apps.common import ( MayanAppConfig, menu_facet, menu_list_facet, menu_setup, menu_object, menu_secondary ) -from navigation import SourceColumn +from mayan.apps.navigation import SourceColumn from .classes import Namespace, Setting from .links import ( @@ -20,7 +20,7 @@ class SmartSettingsApp(MayanAppConfig): app_namespace = 'settings' app_url = 'settings' has_tests = True - name = 'smart_settings' + name = 'mayan.apps.smart_settings' verbose_name = _('Smart settings') def ready(self): diff --git a/mayan/apps/smart_settings/icons.py b/mayan/apps/smart_settings/icons.py index 22ab54107e..3bb662d9aa 100644 --- a/mayan/apps/smart_settings/icons.py +++ b/mayan/apps/smart_settings/icons.py @@ -1,5 +1,5 @@ from __future__ import absolute_import, unicode_literals -from appearance.classes import Icon +from mayan.apps.appearance.classes import Icon icon_namespace_list = Icon(driver_name='fontawesome', symbol='sliders-h') diff --git a/mayan/apps/smart_settings/links.py b/mayan/apps/smart_settings/links.py index 5ac6c7da95..b166801492 100644 --- a/mayan/apps/smart_settings/links.py +++ b/mayan/apps/smart_settings/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_namespace_list from .permissions import permission_settings_edit, permission_settings_view diff --git a/mayan/apps/smart_settings/permissions.py b/mayan/apps/smart_settings/permissions.py index 38f82240a7..e14544944a 100644 --- a/mayan/apps/smart_settings/permissions.py +++ b/mayan/apps/smart_settings/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('smart_settings', _('Smart settings')) diff --git a/mayan/apps/smart_settings/tests/test_classes.py b/mayan/apps/smart_settings/tests/test_classes.py index 00fa74daa8..517fccacdc 100644 --- a/mayan/apps/smart_settings/tests/test_classes.py +++ b/mayan/apps/smart_settings/tests/test_classes.py @@ -2,8 +2,8 @@ from __future__ import absolute_import, unicode_literals import os -from common.settings import setting_paginate_by -from common.tests import BaseTestCase +from mayan.apps.common.settings import setting_paginate_by +from mayan.apps.common.tests import BaseTestCase from .literals import ENVIRONMENT_TEST_NAME, ENVIRONMENT_TEST_VALUE diff --git a/mayan/apps/smart_settings/tests/test_view_permissions.py b/mayan/apps/smart_settings/tests/test_view_permissions.py index 8aad9ace77..4ef5e91e2b 100644 --- a/mayan/apps/smart_settings/tests/test_view_permissions.py +++ b/mayan/apps/smart_settings/tests/test_view_permissions.py @@ -1,6 +1,6 @@ from __future__ import absolute_import, unicode_literals -from common.tests import GenericViewTestCase +from mayan.apps.common.tests import GenericViewTestCase from ..permissions import permission_settings_view diff --git a/mayan/apps/smart_settings/views.py b/mayan/apps/smart_settings/views.py index 86da858a7f..5835182ee1 100644 --- a/mayan/apps/smart_settings/views.py +++ b/mayan/apps/smart_settings/views.py @@ -5,7 +5,7 @@ from django.http import Http404 from django.urls import reverse from django.utils.translation import ugettext_lazy as _ -from common.views import FormView, SingleObjectListView +from mayan.apps.common.views import FormView, SingleObjectListView from .classes import Namespace, Setting from .forms import SettingForm diff --git a/mayan/apps/sources/__init__.py b/mayan/apps/sources/__init__.py index 60cec4c52e..1c4d3107c1 100644 --- a/mayan/apps/sources/__init__.py +++ b/mayan/apps/sources/__init__.py @@ -1,3 +1,3 @@ from __future__ import unicode_literals -default_app_config = 'sources.apps.SourcesApp' +default_app_config = 'mayan.apps.sources.apps.SourcesApp' diff --git a/mayan/apps/sources/apps.py b/mayan/apps/sources/apps.py index 023126fc7c..e77e650088 100644 --- a/mayan/apps/sources/apps.py +++ b/mayan/apps/sources/apps.py @@ -4,16 +4,16 @@ from django.utils.translation import ugettext_lazy as _ from kombu import Exchange, Queue -from common import ( +from mayan.apps.common import ( MayanAppConfig, MissingItem, menu_list_facet, menu_object, menu_secondary, menu_sidebar, menu_setup ) -from common.signals import post_initial_setup, post_upgrade -from converter.links import link_transformation_list -from documents.menus import menu_documents -from documents.signals import post_version_upload +from mayan.apps.common.signals import post_initial_setup, post_upgrade +from mayan.apps.converter.links import link_transformation_list +from mayan.apps.documents.menus import menu_documents +from mayan.apps.documents.signals import post_version_upload +from mayan.apps.navigation import SourceColumn from mayan.celery import app -from navigation import SourceColumn from .classes import StagingFile from .handlers import ( @@ -34,9 +34,11 @@ from .widgets import StagingFileThumbnailWidget class SourcesApp(MayanAppConfig): + app_namespace = 'sources' + app_url = 'sources' has_rest_api = True has_tests = True - name = 'sources' + name = 'mayan.apps.sources' verbose_name = _('Sources') def ready(self): @@ -106,16 +108,16 @@ class SourcesApp(MayanAppConfig): app.conf.CELERY_ROUTES.update( { - 'sources.tasks.task_check_interval_source': { + 'mayan.apps.sources.tasks.task_check_interval_source': { 'queue': 'sources_periodic' }, - 'sources.tasks.task_generate_staging_file_image': { + 'mayan.apps.sources.tasks.task_generate_staging_file_image': { 'queue': 'sources_fast' }, - 'sources.tasks.task_source_handle_upload': { + 'mayan.apps.sources.tasks.task_source_handle_upload': { 'queue': 'sources' }, - 'sources.tasks.task_upload_document': { + 'mayan.apps.sources.tasks.task_upload_document': { 'queue': 'sources' }, } diff --git a/mayan/apps/sources/classes.py b/mayan/apps/sources/classes.py index a730d012d0..eace9dca0f 100644 --- a/mayan/apps/sources/classes.py +++ b/mayan/apps/sources/classes.py @@ -13,7 +13,7 @@ from django.urls import reverse from django.utils.encoding import force_text, python_2_unicode_compatible from django.utils.six.moves.urllib.parse import quote_plus, unquote_plus -from converter import TransformationResize, converter_class +from mayan.apps.converter import TransformationResize, converter_class from .storages import storage_staging_file_image_cache diff --git a/mayan/apps/sources/forms.py b/mayan/apps/sources/forms.py index 634f088cf2..a6431f71e5 100644 --- a/mayan/apps/sources/forms.py +++ b/mayan/apps/sources/forms.py @@ -7,7 +7,7 @@ from django.utils.encoding import force_text from django.utils.translation import ugettext from django.utils.translation import ugettext_lazy as _ -from documents.forms import DocumentForm +from mayan.apps.documents.forms import DocumentForm from .models import ( IMAPEmail, POP3Email, SaneScanner, StagingFolderSource, WebFormSource, diff --git a/mayan/apps/sources/icons.py b/mayan/apps/sources/icons.py index 739e6d3ed7..c4e751bbd4 100644 --- a/mayan/apps/sources/icons.py +++ b/mayan/apps/sources/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_create_multiple = Icon( driver_name='fontawesome', symbol='upload' diff --git a/mayan/apps/sources/links.py b/mayan/apps/sources/links.py index 6842eb5af0..548622417b 100644 --- a/mayan/apps/sources/links.py +++ b/mayan/apps/sources/links.py @@ -3,10 +3,10 @@ from __future__ import absolute_import, unicode_literals from django.apps import apps from django.utils.translation import ugettext_lazy as _ -from documents.permissions import ( +from mayan.apps.documents.permissions import ( permission_document_create, permission_document_new_version ) -from navigation import Link +from mayan.apps.navigation import Link from .icons import ( icon_document_create_multiple, icon_log, icon_setup_sources, diff --git a/mayan/apps/sources/models.py b/mayan/apps/sources/models.py index 72bb2e9268..6461e377d2 100644 --- a/mayan/apps/sources/models.py +++ b/mayan/apps/sources/models.py @@ -19,17 +19,17 @@ from django.utils.encoding import ( from django.utils.timezone import now from django.utils.translation import ugettext_lazy as _ +from djcelery.models import PeriodicTask, IntervalSchedule from model_utils.managers import InheritanceManager -from common.compressed_files import Archive -from common.exceptions import NoMIMETypeMatch -from common.utils import TemporaryFile -from converter.models import Transformation -from djcelery.models import PeriodicTask, IntervalSchedule -from documents.models import Document, DocumentType -from documents.settings import setting_language -from metadata.api import set_bulk_metadata -from metadata.models import MetadataType +from mayan.apps.common.compressed_files import Archive +from mayan.apps.common.exceptions import NoMIMETypeMatch +from mayan.apps.common.utils import TemporaryFile +from mayan.apps.converter.models import Transformation +from mayan.apps.documents.models import Document, DocumentType +from mayan.apps.documents.settings import setting_language +from mayan.apps.metadata.api import set_bulk_metadata +from mayan.apps.metadata.models import MetadataType from .classes import PseudoFile, SourceUploadedFile, StagingFile from .exceptions import SourceException diff --git a/mayan/apps/sources/permissions.py b/mayan/apps/sources/permissions.py index 0575b8561f..2d09a8a5e7 100644 --- a/mayan/apps/sources/permissions.py +++ b/mayan/apps/sources/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('sources_setup', _('Sources setup')) permission_sources_setup_create = namespace.add_permission( diff --git a/mayan/apps/sources/queues.py b/mayan/apps/sources/queues.py index 54afa4ea89..eebc52c0e4 100644 --- a/mayan/apps/sources/queues.py +++ b/mayan/apps/sources/queues.py @@ -2,7 +2,7 @@ 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_sources = CeleryQueue( name='sources', label=_('Sources') @@ -15,18 +15,18 @@ queue_sources_fast = CeleryQueue( ) queue_sources_fast.add_task_type( - name='sources.tasks.task_generate_staging_file_image', + name='mayan.apps.sources.tasks.task_generate_staging_file_image', label=_('Generate staging file image') ) queue_sources_periodic.add_task_type( - name='sources.tasks.task_check_interval_source', + name='mayan.apps.sources.tasks.task_check_interval_source', label=_('Check interval source') ) queue_sources.add_task_type( - name='sources.tasks.task_source_handle_upload', + name='mayan.apps.sources.tasks.task_source_handle_upload', label=_('Handle upload') ) queue_sources.add_task_type( - name='sources.tasks.task_upload_document', + name='mayan.apps.sources.tasks.task_upload_document', label=_('Upload document') ) diff --git a/mayan/apps/sources/settings.py b/mayan/apps/sources/settings.py index 666605b352..f35e989e67 100644 --- a/mayan/apps/sources/settings.py +++ b/mayan/apps/sources/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='sources', label=_('Sources')) diff --git a/mayan/apps/sources/tasks.py b/mayan/apps/sources/tasks.py index 89e27930e2..74422b9ca5 100644 --- a/mayan/apps/sources/tasks.py +++ b/mayan/apps/sources/tasks.py @@ -9,10 +9,10 @@ from django.utils.translation import ugettext_lazy as _ from mayan.celery import app -from common.compressed_files import Archive -from common.exceptions import NoMIMETypeMatch -from lock_manager import LockError -from lock_manager.runtime import locking_backend +from mayan.apps.common.compressed_files import Archive +from mayan.apps.common.exceptions import NoMIMETypeMatch +from mayan.apps.lock_manager import LockError +from mayan.apps.lock_manager.runtime import locking_backend from .literals import ( DEFAULT_SOURCE_LOCK_EXPIRE, DEFAULT_SOURCE_TASK_RETRY_DELAY diff --git a/mayan/apps/sources/tests/test_classes.py b/mayan/apps/sources/tests/test_classes.py index 68a6433ca1..7466b33fad 100644 --- a/mayan/apps/sources/tests/test_classes.py +++ b/mayan/apps/sources/tests/test_classes.py @@ -3,9 +3,9 @@ from __future__ import unicode_literals import os import shutil -from common.tests import BaseTestCase -from common.utils import mkdtemp -from documents.tests import TEST_NON_ASCII_DOCUMENT_PATH +from mayan.apps.common.tests import BaseTestCase +from mayan.apps.common.utils import mkdtemp +from mayan.apps.documents.tests import TEST_NON_ASCII_DOCUMENT_PATH from ..classes import StagingFile diff --git a/mayan/apps/sources/tests/test_links.py b/mayan/apps/sources/tests/test_links.py index 500e563332..f8708bf326 100644 --- a/mayan/apps/sources/tests/test_links.py +++ b/mayan/apps/sources/tests/test_links.py @@ -1,7 +1,7 @@ from __future__ import unicode_literals -from documents.tests import GenericDocumentViewTestCase -from documents.permissions import permission_document_create +from mayan.apps.documents.tests import GenericDocumentViewTestCase +from mayan.apps.documents.permissions import permission_document_create from ..links import link_document_create_multiple diff --git a/mayan/apps/sources/tests/test_models.py b/mayan/apps/sources/tests/test_models.py index fb619ee614..b77dde4cd7 100644 --- a/mayan/apps/sources/tests/test_models.py +++ b/mayan/apps/sources/tests/test_models.py @@ -8,15 +8,15 @@ from pathlib2 import Path from django.test import override_settings from django.utils.encoding import force_text -from common.utils import mkdtemp -from common.tests import BaseTestCase -from documents.models import Document, DocumentType -from documents.tests import ( +from mayan.apps.common.utils import mkdtemp +from mayan.apps.common.tests import BaseTestCase +from mayan.apps.documents.models import Document, DocumentType +from mayan.apps.documents.tests import ( DocumentTestMixin, TEST_COMPRESSED_DOCUMENT_PATH, TEST_DOCUMENT_TYPE_LABEL, TEST_NON_ASCII_DOCUMENT_FILENAME, TEST_NON_ASCII_DOCUMENT_PATH, TEST_NON_ASCII_COMPRESSED_DOCUMENT_PATH ) -from metadata.models import MetadataType +from mayan.apps.metadata.models import MetadataType from ..literals import SOURCE_UNCOMPRESS_CHOICE_Y from ..models import ( diff --git a/mayan/apps/sources/tests/test_views.py b/mayan/apps/sources/tests/test_views.py index 98c8cabc8c..8822fe5e54 100644 --- a/mayan/apps/sources/tests/test_views.py +++ b/mayan/apps/sources/tests/test_views.py @@ -5,12 +5,12 @@ import shutil from django.test import override_settings -from checkouts.models import NewVersionBlock -from common.tests import GenericViewTestCase -from common.utils import fs_cleanup, mkdtemp -from documents.models import Document, DocumentType -from documents.permissions import permission_document_create -from documents.tests import ( +from mayan.apps.checkouts.models import NewVersionBlock +from mayan.apps.common.tests import GenericViewTestCase +from mayan.apps.common.utils import fs_cleanup, mkdtemp +from mayan.apps.documents.models import Document, DocumentType +from mayan.apps.documents.permissions import permission_document_create +from mayan.apps.documents.tests import ( GenericDocumentViewTestCase, TEST_DOCUMENT_DESCRIPTION, TEST_DOCUMENT_TYPE_LABEL, TEST_SMALL_DOCUMENT_CHECKSUM, TEST_SMALL_DOCUMENT_PATH, diff --git a/mayan/apps/sources/views.py b/mayan/apps/sources/views.py index 0373ad7169..178e31d557 100644 --- a/mayan/apps/sources/views.py +++ b/mayan/apps/sources/views.py @@ -12,22 +12,22 @@ from django.urls import reverse, reverse_lazy from django.utils.encoding import force_text from django.utils.translation import ugettext_lazy as _ -from acls.models import AccessControlList -from checkouts.models import NewVersionBlock -from common import menu_facet -from common.models import SharedUploadedFile -from common.utils import encapsulate -from common.views import ( +from mayan.apps.acls.models import AccessControlList +from mayan.apps.checkouts.models import NewVersionBlock +from mayan.apps.common import menu_facet +from mayan.apps.common.models import SharedUploadedFile +from mayan.apps.common.utils import encapsulate +from mayan.apps.common.views import ( ConfirmView, MultiFormView, SingleObjectCreateView, SingleObjectDeleteView, SingleObjectEditView, SingleObjectListView ) -from common.widgets import TwoStateWidget -from documents.models import DocumentType, Document -from documents.permissions import ( +from mayan.apps.common.widgets import TwoStateWidget +from mayan.apps.documents.models import DocumentType, Document +from mayan.apps.documents.permissions import ( permission_document_create, permission_document_new_version ) -from documents.tasks import task_upload_new_version -from navigation import Link +from mayan.apps.documents.tasks import task_upload_new_version +from mayan.apps.navigation import Link from .exceptions import SourceException from .forms import ( diff --git a/mayan/apps/sources/widgets.py b/mayan/apps/sources/widgets.py index 15ee0106bf..18179969f5 100644 --- a/mayan/apps/sources/widgets.py +++ b/mayan/apps/sources/widgets.py @@ -2,7 +2,7 @@ from __future__ import unicode_literals from django.template.loader import render_to_string -from documents.settings import ( +from mayan.apps.documents.settings import ( setting_preview_width, setting_preview_height, setting_thumbnail_width, setting_thumbnail_height ) diff --git a/mayan/apps/sources/wizards.py b/mayan/apps/sources/wizards.py index 89ffa0f645..024758e398 100644 --- a/mayan/apps/sources/wizards.py +++ b/mayan/apps/sources/wizards.py @@ -11,7 +11,7 @@ from django.utils.translation import ugettext_lazy as _ from formtools.wizard.views import SessionWizardView -from documents.forms import DocumentTypeSelectForm +from mayan.apps.documents.forms import DocumentTypeSelectForm from .icons import icon_wizard_submit diff --git a/mayan/apps/storage/__init__.py b/mayan/apps/storage/__init__.py index 195d633d7a..95bfac8073 100644 --- a/mayan/apps/storage/__init__.py +++ b/mayan/apps/storage/__init__.py @@ -1,3 +1,3 @@ from __future__ import unicode_literals -default_app_config = 'storage.apps.StorageApp' +default_app_config = 'mayan.apps.storage.apps.StorageApp' diff --git a/mayan/apps/storage/apps.py b/mayan/apps/storage/apps.py index a8db56dc9e..2cc2965e07 100644 --- a/mayan/apps/storage/apps.py +++ b/mayan/apps/storage/apps.py @@ -5,5 +5,5 @@ from django.utils.translation import ugettext_lazy as _ class StorageApp(apps.AppConfig): - name = 'storage' + name = 'mayan.apps.storage' verbose_name = _('Storage') diff --git a/mayan/apps/tags/__init__.py b/mayan/apps/tags/__init__.py index ba75c309b6..171dc14f06 100644 --- a/mayan/apps/tags/__init__.py +++ b/mayan/apps/tags/__init__.py @@ -1,3 +1,3 @@ from __future__ import unicode_literals -default_app_config = 'tags.apps.TagsApp' +default_app_config = 'mayan.apps.tags.apps.TagsApp' diff --git a/mayan/apps/tags/api_views.py b/mayan/apps/tags/api_views.py index ceb318d8d7..d62a6e50c2 100644 --- a/mayan/apps/tags/api_views.py +++ b/mayan/apps/tags/api_views.py @@ -6,12 +6,12 @@ from rest_framework import generics from rest_framework.exceptions import ValidationError from rest_framework.response import Response -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 Tag from .permissions import ( diff --git a/mayan/apps/tags/apps.py b/mayan/apps/tags/apps.py index e158fe81db..7ee7917ec5 100644 --- a/mayan/apps/tags/apps.py +++ b/mayan/apps/tags/apps.py @@ -4,21 +4,21 @@ from django.apps import apps from django.db.models.signals import m2m_changed, 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_list_facet, menu_object, menu_main, menu_multi_item, menu_sidebar ) -from common.classes import ModelField -from documents.search import document_page_search, document_search -from events import ModelEventType -from events.links import ( +from mayan.apps.common.classes import ModelField +from mayan.apps.documents.search import document_page_search, document_search +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 navigation import SourceColumn +from mayan.apps.events.permissions import permission_events_view +from mayan.apps.navigation import SourceColumn from .events import ( event_tag_attach, event_tag_created, event_tag_edited, event_tag_remove @@ -41,9 +41,11 @@ from .widgets import widget_document_tags class TagsApp(MayanAppConfig): + app_namespace = 'tags' + app_urls = 'tags' has_rest_api = True has_tests = True - name = 'tags' + name = 'mayan.apps.tags' verbose_name = _('Tags') def ready(self): diff --git a/mayan/apps/tags/events.py b/mayan/apps/tags/events.py index eaca57e4cd..44f5793802 100644 --- a/mayan/apps/tags/events.py +++ b/mayan/apps/tags/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='tags', label=_('Tags')) diff --git a/mayan/apps/tags/forms.py b/mayan/apps/tags/forms.py index 4afbf9cfc8..392de0d68f 100644 --- a/mayan/apps/tags/forms.py +++ b/mayan/apps/tags/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 Tag from .permissions import permission_tag_view diff --git a/mayan/apps/tags/handlers.py b/mayan/apps/tags/handlers.py index c7b180b855..1b2a6fd6a7 100644 --- a/mayan/apps/tags/handlers.py +++ b/mayan/apps/tags/handlers.py @@ -2,7 +2,7 @@ from __future__ import unicode_literals import logging -from document_indexing.tasks import task_index_document +from mayan.apps.document_indexing.tasks import task_index_document logger = logging.getLogger(__name__) diff --git a/mayan/apps/tags/icons.py b/mayan/apps/tags/icons.py index 600f49be8c..12372789e5 100644 --- a/mayan/apps/tags/icons.py +++ b/mayan/apps/tags/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_menu_tags = Icon(driver_name='fontawesome', symbol='tag') icon_tag_attach = Icon(driver_name='fontawesome', symbol='plus') diff --git a/mayan/apps/tags/links.py b/mayan/apps/tags/links.py index a57734b15c..8da32cf19b 100644 --- a/mayan/apps/tags/links.py +++ b/mayan/apps/tags/links.py @@ -2,8 +2,8 @@ from __future__ import unicode_literals from django.utils.translation import ugettext_lazy as _ -from documents.icons import icon_document_list -from navigation import Link, get_cascade_condition +from mayan.apps.documents.icons import icon_document_list +from mayan.apps.navigation import Link, get_cascade_condition from .icons import ( icon_tag_attach, icon_tag_create, icon_tag_document_list, icon_tag_list diff --git a/mayan/apps/tags/menus.py b/mayan/apps/tags/menus.py index 7bde026fd1..759788637e 100644 --- a/mayan/apps/tags/menus.py +++ b/mayan/apps/tags/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_menu_tags from .permissions import permission_tag_create, permission_tag_view diff --git a/mayan/apps/tags/models.py b/mayan/apps/tags/models.py index c7b677aa43..dc04737070 100644 --- a/mayan/apps/tags/models.py +++ b/mayan/apps/tags/models.py @@ -7,9 +7,9 @@ from django.utils.translation import ugettext_lazy as _ from colorful.fields import RGBColorField -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_tag_attach, event_tag_created, event_tag_edited, event_tag_remove diff --git a/mayan/apps/tags/permissions.py b/mayan/apps/tags/permissions.py index ba9d0f4146..3d498787dc 100644 --- a/mayan/apps/tags/permissions.py +++ b/mayan/apps/tags/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('tags', _('Tags')) diff --git a/mayan/apps/tags/search.py b/mayan/apps/tags/search.py index cdf2be833d..f16b8e75c1 100644 --- a/mayan/apps/tags/search.py +++ b/mayan/apps/tags/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_tag_view tag_search = SearchModel( app_label='tags', model_name='Tag', permission=permission_tag_view, - serializer_string='tags.serializers.TagSerializer' + serializer_string='mayan.apps.tags.serializers.TagSerializer' ) tag_search.add_model_field( diff --git a/mayan/apps/tags/serializers.py b/mayan/apps/tags/serializers.py index daf0fcdbf5..64c3c01ded 100644 --- a/mayan/apps/tags/serializers.py +++ b/mayan/apps/tags/serializers.py @@ -7,8 +7,8 @@ from rest_framework import serializers from rest_framework.exceptions import ValidationError from rest_framework.reverse import reverse -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 .models import Tag from .permissions import permission_tag_attach diff --git a/mayan/apps/tags/tests/test_actions.py b/mayan/apps/tags/tests/test_actions.py index a4fdd883b6..bc7bb0fa11 100644 --- a/mayan/apps/tags/tests/test_actions.py +++ b/mayan/apps/tags/tests/test_actions.py @@ -1,6 +1,6 @@ from __future__ import unicode_literals -from document_states.tests.test_actions import ActionTestCase +from mayan.apps.document_states.tests.test_actions import ActionTestCase from ..models import Tag from ..workflow_actions import AttachTagAction, RemoveTagAction diff --git a/mayan/apps/tags/tests/test_api.py b/mayan/apps/tags/tests/test_api.py index a0f1d1e084..3f399d6435 100644 --- a/mayan/apps/tags/tests/test_api.py +++ b/mayan/apps/tags/tests/test_api.py @@ -5,9 +5,9 @@ from django.utils.encoding import force_text from rest_framework import status -from documents.permissions import permission_document_view -from documents.tests import DocumentTestMixin -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.rest_api.tests import BaseAPITestCase from ..models import Tag from ..permissions import ( diff --git a/mayan/apps/tags/tests/test_events.py b/mayan/apps/tags/tests/test_events.py index 6ca0744825..fd63cb0533 100644 --- a/mayan/apps/tags/tests/test_events.py +++ b/mayan/apps/tags/tests/test_events.py @@ -2,7 +2,7 @@ from __future__ import unicode_literals from actstream.models import Action -from documents.tests import GenericDocumentViewTestCase +from mayan.apps.documents.tests import GenericDocumentViewTestCase from ..events import event_tag_created, event_tag_edited from ..models import Tag diff --git a/mayan/apps/tags/tests/test_indexing.py b/mayan/apps/tags/tests/test_indexing.py index 1024a410e5..6dac6c8889 100644 --- a/mayan/apps/tags/tests/test_indexing.py +++ b/mayan/apps/tags/tests/test_indexing.py @@ -2,10 +2,10 @@ from __future__ import unicode_literals from django.test import override_settings -from common.tests import BaseTestCase -from documents.tests import DocumentTestMixin -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 +from mayan.apps.document_indexing.models import Index, IndexInstanceNode +from mayan.apps.document_indexing.tests.literals import TEST_INDEX_LABEL from ..models import Tag diff --git a/mayan/apps/tags/tests/test_models.py b/mayan/apps/tags/tests/test_models.py index fd94ecc8ed..473e414b3c 100644 --- a/mayan/apps/tags/tests/test_models.py +++ b/mayan/apps/tags/tests/test_models.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 +from mayan.apps.common.tests import BaseTestCase +from mayan.apps.documents.tests import DocumentTestMixin from ..models import Tag diff --git a/mayan/apps/tags/tests/test_views.py b/mayan/apps/tags/tests/test_views.py index 4c123fa8ae..0c4d65c5a0 100644 --- a/mayan/apps/tags/tests/test_views.py +++ b/mayan/apps/tags/tests/test_views.py @@ -1,7 +1,7 @@ from __future__ import unicode_literals -from documents.permissions import permission_document_view -from documents.tests import GenericDocumentViewTestCase +from mayan.apps.documents.permissions import permission_document_view +from mayan.apps.documents.tests import GenericDocumentViewTestCase from ..models import Tag from ..permissions import ( diff --git a/mayan/apps/tags/tests/test_wizard_steps.py b/mayan/apps/tags/tests/test_wizard_steps.py index 273381465c..c82470c52c 100644 --- a/mayan/apps/tags/tests/test_wizard_steps.py +++ b/mayan/apps/tags/tests/test_wizard_steps.py @@ -1,12 +1,12 @@ 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 ) diff --git a/mayan/apps/tags/views.py b/mayan/apps/tags/views.py index 61b8aa25fe..b14d47ab4a 100644 --- a/mayan/apps/tags/views.py +++ b/mayan/apps/tags/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, MultipleObjectConfirmActionView, SingleObjectCreateView, SingleObjectEditView, SingleObjectListView ) -from documents.models import Document -from documents.views import DocumentListView -from documents.permissions import permission_document_view +from mayan.apps.documents.models import Document +from mayan.apps.documents.views import DocumentListView +from mayan.apps.documents.permissions import permission_document_view from .forms import TagMultipleSelectionForm from .icons import ( diff --git a/mayan/apps/tags/wizard_steps.py b/mayan/apps/tags/wizard_steps.py index 5ad9a3e8c2..84dd5c6055 100644 --- a/mayan/apps/tags/wizard_steps.py +++ b/mayan/apps/tags/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 TagMultipleSelectionForm diff --git a/mayan/apps/tags/workflow_actions.py b/mayan/apps/tags/workflow_actions.py index 8afad617ba..d7b626c219 100644 --- a/mayan/apps/tags/workflow_actions.py +++ b/mayan/apps/tags/workflow_actions.py @@ -4,10 +4,10 @@ import logging from django.utils.translation import ugettext_lazy as _ -from acls.models import AccessControlList -from document_states.classes import WorkflowAction -from tags.models import Tag -from tags.permissions import permission_tag_attach, permission_tag_remove +from mayan.apps.acls.models import AccessControlList +from mayan.apps.document_states.classes import WorkflowAction +from mayan.apps.tags.models import Tag +from mayan.apps.tags.permissions import permission_tag_attach, permission_tag_remove __all__ = ('AttachTagAction', 'RemoveTagAction') logger = logging.getLogger(__name__) diff --git a/mayan/apps/task_manager/__init__.py b/mayan/apps/task_manager/__init__.py index 7340b19f7e..c706763629 100644 --- a/mayan/apps/task_manager/__init__.py +++ b/mayan/apps/task_manager/__init__.py @@ -1,3 +1,3 @@ from __future__ import unicode_literals -default_app_config = 'task_manager.apps.TaskManagerApp' +default_app_config = 'mayan.apps.task_manager.apps.TaskManagerApp' diff --git a/mayan/apps/task_manager/apps.py b/mayan/apps/task_manager/apps.py index 2660d558f8..8b92c1dc9b 100644 --- a/mayan/apps/task_manager/apps.py +++ b/mayan/apps/task_manager/apps.py @@ -2,11 +2,11 @@ from __future__ import unicode_literals from django.utils.translation import ugettext_lazy as _ -from common import ( +from mayan.apps.common import ( MayanAppConfig, menu_object, menu_secondary, menu_tools ) -from common.widgets import TwoStateWidget -from navigation import SourceColumn +from mayan.apps.common.widgets import TwoStateWidget +from mayan.apps.navigation import SourceColumn from .classes import CeleryQueue, Task from .links import ( @@ -20,7 +20,7 @@ class TaskManagerApp(MayanAppConfig): app_namespace = 'task_manager' app_url = 'task_manager' has_tests = True - name = 'task_manager' + name = 'mayan.apps.task_manager' verbose_name = _('Task manager') def ready(self): diff --git a/mayan/apps/task_manager/icons.py b/mayan/apps/task_manager/icons.py index 8129ecacc1..39f1a46bb6 100644 --- a/mayan/apps/task_manager/icons.py +++ b/mayan/apps/task_manager/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_task_manager = Icon(driver_name='fontawesome', symbol='braille') icon_queue_list = Icon(driver_name='fontawesome', symbol='braille') diff --git a/mayan/apps/task_manager/links.py b/mayan/apps/task_manager/links.py index 9dee368fa3..1e88569078 100644 --- a/mayan/apps/task_manager/links.py +++ b/mayan/apps/task_manager/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_task_manager, icon_queue_list from .permissions import permission_task_view diff --git a/mayan/apps/task_manager/permissions.py b/mayan/apps/task_manager/permissions.py index 257016119e..31e6765690 100644 --- a/mayan/apps/task_manager/permissions.py +++ b/mayan/apps/task_manager/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('task_manager', _('Task manager')) diff --git a/mayan/apps/task_manager/tests/test_views.py b/mayan/apps/task_manager/tests/test_views.py index 3f09ba40c3..15c599344d 100644 --- a/mayan/apps/task_manager/tests/test_views.py +++ b/mayan/apps/task_manager/tests/test_views.py @@ -1,6 +1,6 @@ from __future__ import unicode_literals -from common.tests import GenericViewTestCase +from mayan.apps.common.tests import GenericViewTestCase from ..classes import CeleryQueue from ..permissions import permission_task_view diff --git a/mayan/apps/task_manager/views.py b/mayan/apps/task_manager/views.py index 7cbfd12ba0..05a83a35f7 100644 --- a/mayan/apps/task_manager/views.py +++ b/mayan/apps/task_manager/views.py @@ -3,7 +3,7 @@ from __future__ import absolute_import, unicode_literals from django.contrib import messages from django.utils.translation import ugettext_lazy as _ -from common.generics import SingleObjectListView +from mayan.apps.common.generics import SingleObjectListView from .classes import CeleryQueue from .permissions import permission_task_view diff --git a/mayan/apps/user_management/__init__.py b/mayan/apps/user_management/__init__.py index 7aafdf26c5..4d5207058c 100644 --- a/mayan/apps/user_management/__init__.py +++ b/mayan/apps/user_management/__init__.py @@ -1,3 +1,3 @@ from __future__ import unicode_literals -default_app_config = 'user_management.apps.UserManagementApp' +default_app_config = 'mayan.apps.user_management.apps.UserManagementApp' diff --git a/mayan/apps/user_management/api_views.py b/mayan/apps/user_management/api_views.py index afe028d46c..3d725dec67 100644 --- a/mayan/apps/user_management/api_views.py +++ b/mayan/apps/user_management/api_views.py @@ -6,9 +6,9 @@ from django.shortcuts import get_object_or_404 from rest_framework import generics -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 .permissions import ( permission_group_create, permission_group_delete, permission_group_edit, diff --git a/mayan/apps/user_management/apps.py b/mayan/apps/user_management/apps.py index 84efb1ce0b..5d07c8ce45 100644 --- a/mayan/apps/user_management/apps.py +++ b/mayan/apps/user_management/apps.py @@ -5,17 +5,17 @@ from django.contrib.auth import get_user_model from django.db.models.signals import post_save 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 ( menu_list_facet, menu_multi_item, menu_object, menu_secondary, menu_setup ) -from common.apps import MayanAppConfig -from common.widgets import TwoStateWidget -from metadata import MetadataLookup -from navigation import SourceColumn -from rest_api.fields import DynamicSerializerField +from mayan.apps.common.apps import MayanAppConfig +from mayan.apps.common.widgets import TwoStateWidget +from mayan.apps.metadata import MetadataLookup +from mayan.apps.navigation import SourceColumn +from mayan.apps.rest_api.fields import DynamicSerializerField from .handlers import handler_initialize_new_user_options from .links import ( @@ -48,10 +48,11 @@ def get_users(): class UserManagementApp(MayanAppConfig): + app_namespace = 'user_management' app_url = 'accounts' has_rest_api = True has_tests = True - name = 'user_management' + name = 'mayan.apps.user_management' verbose_name = _('User management') def ready(self): @@ -63,7 +64,7 @@ class UserManagementApp(MayanAppConfig): DynamicSerializerField.add_serializer( klass=get_user_model(), - serializer_class='user_management.serializers.UserSerializer' + serializer_class='mayan.apps.user_management.serializers.UserSerializer' ) MetadataLookup( diff --git a/mayan/apps/user_management/icons.py b/mayan/apps/user_management/icons.py index ff0317b5f9..d33bc2d7da 100644 --- a/mayan/apps/user_management/icons.py +++ b/mayan/apps/user_management/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_group = Icon(driver_name='fontawesome', symbol='users') icon_group_create = Icon(driver_name='fontawesome', symbol='plus') diff --git a/mayan/apps/user_management/links.py b/mayan/apps/user_management/links.py index c7723323c2..e2b2b4fe17 100644 --- a/mayan/apps/user_management/links.py +++ b/mayan/apps/user_management/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_group, icon_group_create, icon_group_members, icon_group_setup, diff --git a/mayan/apps/user_management/permissions.py b/mayan/apps/user_management/permissions.py index e7a97d1540..e2eca5f948 100644 --- a/mayan/apps/user_management/permissions.py +++ b/mayan/apps/user_management/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('user_management', _('User management')) diff --git a/mayan/apps/user_management/search.py b/mayan/apps/user_management/search.py index 736ddbbd00..54e7a26dc2 100644 --- a/mayan/apps/user_management/search.py +++ b/mayan/apps/user_management/search.py @@ -3,7 +3,7 @@ from __future__ import absolute_import, unicode_literals from django.conf import settings 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_group_view, permission_user_view @@ -12,7 +12,7 @@ user_app, user_model = settings.AUTH_USER_MODEL.split('.') user_search = SearchModel( app_label=user_app, model_name=user_model, permission=permission_user_view, - serializer_string='user_management.serializers.UserSerializer' + serializer_string='mayan.apps.user_management.serializers.UserSerializer' ) user_search.add_model_field( diff --git a/mayan/apps/user_management/serializers.py b/mayan/apps/user_management/serializers.py index 10d20518cc..559b2c6969 100644 --- a/mayan/apps/user_management/serializers.py +++ b/mayan/apps/user_management/serializers.py @@ -9,7 +9,7 @@ from django.utils.translation import ugettext_lazy as _ from rest_framework import serializers from rest_framework.exceptions import ValidationError -from acls.models import AccessControlList +from mayan.apps.acls.models import AccessControlList from .permissions import permission_group_view diff --git a/mayan/apps/user_management/tests/test_api.py b/mayan/apps/user_management/tests/test_api.py index f84671b8ea..b69232fc07 100644 --- a/mayan/apps/user_management/tests/test_api.py +++ b/mayan/apps/user_management/tests/test_api.py @@ -5,7 +5,7 @@ from django.contrib.auth.models import Group from rest_framework import status -from rest_api.tests import BaseAPITestCase +from mayan.apps.rest_api.tests import BaseAPITestCase from ..permissions import ( permission_group_create, permission_group_delete, diff --git a/mayan/apps/user_management/tests/test_models.py b/mayan/apps/user_management/tests/test_models.py index 12e3b5c4e3..7e96927453 100644 --- a/mayan/apps/user_management/tests/test_models.py +++ b/mayan/apps/user_management/tests/test_models.py @@ -1,6 +1,6 @@ from __future__ import unicode_literals -from common.tests import BaseTestCase +from mayan.apps.common.tests import BaseTestCase from .mixins import UserTestMixin diff --git a/mayan/apps/user_management/tests/test_views.py b/mayan/apps/user_management/tests/test_views.py index 5c2487caca..50a9b25497 100644 --- a/mayan/apps/user_management/tests/test_views.py +++ b/mayan/apps/user_management/tests/test_views.py @@ -3,13 +3,11 @@ from __future__ import unicode_literals from django.contrib.auth import get_user_model from django.contrib.auth.models import Group -from common.tests import GenericViewTestCase -from documents.tests import GenericDocumentViewTestCase - -from metadata.models import MetadataType -from metadata.permissions import permission_metadata_document_edit - -from metadata.tests.literals import ( +from mayan.apps.common.tests import GenericViewTestCase +from mayan.apps.documents.tests import GenericDocumentViewTestCase +from mayan.apps.metadata.models import MetadataType +from mayan.apps.metadata.permissions import permission_metadata_document_edit +from mayan.apps.metadata.tests.literals import ( TEST_METADATA_TYPE_LABEL, TEST_METADATA_TYPE_NAME, ) diff --git a/mayan/apps/user_management/views.py b/mayan/apps/user_management/views.py index b0e295134a..c10c44f916 100644 --- a/mayan/apps/user_management/views.py +++ b/mayan/apps/user_management/views.py @@ -12,7 +12,7 @@ from django.template import RequestContext from django.urls import reverse, reverse_lazy from django.utils.translation import ungettext, ugettext_lazy as _ -from common.views import ( +from mayan.apps.common.views import ( AssignRemoveView, MultipleObjectConfirmActionView, MultipleObjectFormActionView, SingleObjectCreateView, SingleObjectDeleteView, SingleObjectEditView, SingleObjectListView diff --git a/mayan/conf.py b/mayan/conf.py index 27a9a82a93..212322bd5d 100644 --- a/mayan/conf.py +++ b/mayan/conf.py @@ -6,7 +6,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='mayan', label=_('Mayan')) diff --git a/mayan/settings/base.py b/mayan/settings/base.py index 3b3a6ed15e..f95767c83a 100644 --- a/mayan/settings/base.py +++ b/mayan/settings/base.py @@ -56,7 +56,7 @@ ALLOWED_HOSTS = ['127.0.0.1', 'localhost', '[::1]'] INSTALLED_APPS = ( # Placed at the top so it can override any template - 'appearance', + 'mayan.apps.appearance', # Django 'django.contrib.admin', 'django.contrib.auth', @@ -81,47 +81,47 @@ INSTALLED_APPS = ( 'solo', 'stronghold', 'widget_tweaks', - # Base generic - 'acls', - 'authentication', - 'common', - 'converter', - 'django_gpg', - 'dynamic_search', - 'lock_manager', - 'mimetype', - 'navigation', - 'permissions', - 'smart_settings', - 'user_management', - # Mayan EDMS - 'cabinets', - 'checkouts', - 'document_comments', - 'document_indexing', - 'document_parsing', - 'document_signatures', - 'document_states', - 'documents', - 'events', - 'linking', - 'mailer', - 'mayan_statistics', - 'metadata', - 'mirroring', - 'motd', - 'ocr', - 'rest_api', - 'sources', - 'storage', - 'tags', - 'task_manager', + # Base apps + 'mayan.apps.acls', + 'mayan.apps.authentication', + 'mayan.apps.common', + 'mayan.apps.converter', + 'mayan.apps.django_gpg', + 'mayan.apps.dynamic_search', + 'mayan.apps.events', + 'mayan.apps.lock_manager', + 'mayan.apps.mimetype', + 'mayan.apps.navigation', + 'mayan.apps.permissions', + 'mayan.apps.smart_settings', + 'mayan.apps.user_management', + # Document apps + 'mayan.apps.cabinets', + 'mayan.apps.checkouts', + 'mayan.apps.document_comments', + 'mayan.apps.document_indexing', + 'mayan.apps.document_parsing', + 'mayan.apps.document_signatures', + 'mayan.apps.document_states', + 'mayan.apps.documents', + 'mayan.apps.linking', + 'mayan.apps.mailer', + 'mayan.apps.mayan_statistics', + 'mayan.apps.metadata', + 'mayan.apps.mirroring', + 'mayan.apps.motd', + 'mayan.apps.ocr', + 'mayan.apps.rest_api', + 'mayan.apps.sources', + 'mayan.apps.storage', + 'mayan.apps.tags', + 'mayan.apps.task_manager', # Placed after rest_api to allow template overriding 'drf_yasg', ) MIDDLEWARE = ( - 'common.middleware.error_logging.ErrorLoggingMiddleware', + 'mayan.apps.common.middleware.error_logging.ErrorLoggingMiddleware', 'django.middleware.security.SecurityMiddleware', 'whitenoise.middleware.WhiteNoiseMiddleware', 'django.contrib.sessions.middleware.SessionMiddleware', @@ -132,9 +132,9 @@ MIDDLEWARE = ( 'django.contrib.messages.middleware.MessageMiddleware', 'django.middleware.clickjacking.XFrameOptionsMiddleware', 'django.middleware.locale.LocaleMiddleware', - 'common.middleware.timezone.TimezoneMiddleware', + 'mayan.apps.common.middleware.timezone.TimezoneMiddleware', 'stronghold.middleware.LoginRequiredMiddleware', - 'common.middleware.ajax_redirect.AjaxRedirect', + 'mayan.apps.common.middleware.ajax_redirect.AjaxRedirect', ) ROOT_URLCONF = 'mayan.urls' @@ -227,8 +227,6 @@ LANGUAGES = ( SITE_ID = 1 -sys.path.append(os.path.join(BASE_DIR, 'apps')) - STATIC_ROOT = os.environ.get( 'MAYAN_STATIC_ROOT', os.path.join(MEDIA_ROOT, 'static') ) @@ -240,7 +238,7 @@ STATICFILES_FINDERS = ( STATICFILES_STORAGE = 'whitenoise.storage.CompressedManifestStaticFilesStorage' -TEST_RUNNER = 'common.tests.runner.MayanTestRunner' +TEST_RUNNER = 'mayan.apps.common.tests.runner.MayanTestRunner' # --------- Django ------------------- diff --git a/mayan/urls/base.py b/mayan/urls/base.py index ec05149168..7e3a9a143d 100644 --- a/mayan/urls/base.py +++ b/mayan/urls/base.py @@ -6,7 +6,7 @@ from django.contrib import admin from drf_yasg.views import get_schema_view from rest_framework import permissions -from rest_api.schemas import openapi_info +from mayan.apps.rest_api.schemas import openapi_info admin.autodiscover() schema_view = get_schema_view(