diff --git a/mayan/apps/acls/__init__.py b/mayan/apps/acls/__init__.py index 67159f8380..f338aec7f5 100644 --- a/mayan/apps/acls/__init__.py +++ b/mayan/apps/acls/__init__.py @@ -2,4 +2,4 @@ from __future__ import unicode_literals from .classes import ModelPermission # NOQA -default_app_config = 'acls.apps.ACLsApp' +default_app_config = 'mayan.apps.acls.apps.ACLsApp' diff --git a/mayan/apps/acls/apps.py b/mayan/apps/acls/apps.py index 9d31ac3e77..73ac37d443 100644 --- a/mayan/apps/acls/apps.py +++ b/mayan/apps/acls/apps.py @@ -2,16 +2,18 @@ from __future__ import unicode_literals from django.utils.translation import ugettext_lazy as _ -from common import MayanAppConfig, menu_object, menu_sidebar -from navigation import SourceColumn +from mayan.apps.common import MayanAppConfig, menu_object, menu_sidebar +from mayan.apps.navigation import SourceColumn from .links import link_acl_create, link_acl_delete, link_acl_permissions class ACLsApp(MayanAppConfig): + app_namespace = 'acls' + app_url = 'acls' has_rest_api = True has_tests = True - name = 'acls' + name = 'mayan.apps.acls' verbose_name = _('ACLs') def ready(self): diff --git a/mayan/apps/acls/icons.py b/mayan/apps/acls/icons.py index 61b294faf3..1a1c73ef30 100644 --- a/mayan/apps/acls/icons.py +++ b/mayan/apps/acls/icons.py @@ -1,6 +1,6 @@ from __future__ import absolute_import, unicode_literals -from appearance.classes import Icon +from mayan.apps.appearance.classes import Icon icon_acl_list = Icon(driver_name='fontawesome', symbol='lock') icon_acl_new = Icon(driver_name='fontawesome', symbol='plus') diff --git a/mayan/apps/acls/links.py b/mayan/apps/acls/links.py index b1b2d07c13..8a12258448 100644 --- a/mayan/apps/acls/links.py +++ b/mayan/apps/acls/links.py @@ -3,7 +3,7 @@ from __future__ import unicode_literals from django.apps import apps from django.utils.translation import ugettext_lazy as _ -from navigation import Link +from mayan.apps.navigation import Link from .icons import icon_acl_list, icon_acl_new from .permissions import permission_acl_view, permission_acl_edit diff --git a/mayan/apps/acls/managers.py b/mayan/apps/acls/managers.py index f625f40836..33eaf40b75 100644 --- a/mayan/apps/acls/managers.py +++ b/mayan/apps/acls/managers.py @@ -9,9 +9,9 @@ from django.db.models import Q from django.utils.encoding import force_text from django.utils.translation import ugettext -from common.utils import return_attrib, return_related -from permissions import Permission -from permissions.models import StoredPermission +from mayan.apps.common.utils import return_attrib, return_related +from mayan.apps.permissions import Permission +from mayan.apps.permissions.models import StoredPermission from .exceptions import PermissionNotValidForClass from .classes import ModelPermission diff --git a/mayan/apps/acls/models.py b/mayan/apps/acls/models.py index 171938c8be..c99648626b 100644 --- a/mayan/apps/acls/models.py +++ b/mayan/apps/acls/models.py @@ -8,7 +8,7 @@ from django.db import models from django.utils.encoding import force_text, python_2_unicode_compatible from django.utils.translation import ugettext_lazy as _ -from permissions.models import Role, StoredPermission +from mayan.apps.permissions.models import Role, StoredPermission from .managers import AccessControlListManager diff --git a/mayan/apps/acls/permissions.py b/mayan/apps/acls/permissions.py index da7a5ddce9..b2e7e789a1 100644 --- a/mayan/apps/acls/permissions.py +++ b/mayan/apps/acls/permissions.py @@ -2,7 +2,7 @@ from __future__ import absolute_import, unicode_literals from django.utils.translation import ugettext_lazy as _ -from permissions import PermissionNamespace +from mayan.apps.permissions import PermissionNamespace namespace = PermissionNamespace('acls', _('Access control lists')) diff --git a/mayan/apps/acls/serializers.py b/mayan/apps/acls/serializers.py index d312f8d827..1ad961242f 100644 --- a/mayan/apps/acls/serializers.py +++ b/mayan/apps/acls/serializers.py @@ -9,10 +9,10 @@ from rest_framework import serializers from rest_framework.exceptions import ValidationError from rest_framework.reverse import reverse -from common.serializers import ContentTypeSerializer -from permissions import Permission -from permissions.models import Role, StoredPermission -from permissions.serializers import PermissionSerializer, RoleSerializer +from mayan.apps.common.serializers import ContentTypeSerializer +from mayan.apps.permissions import Permission +from mayan.apps.permissions.models import Role, StoredPermission +from mayan.apps.permissions.serializers import PermissionSerializer, RoleSerializer from .models import AccessControlList diff --git a/mayan/apps/acls/tests/mixins.py b/mayan/apps/acls/tests/mixins.py index 8eac0d80d6..ff8b2193e7 100644 --- a/mayan/apps/acls/tests/mixins.py +++ b/mayan/apps/acls/tests/mixins.py @@ -3,11 +3,11 @@ from __future__ import unicode_literals from django.contrib.auth import get_user_model from django.contrib.auth.models import Group -from acls.models import AccessControlList -from permissions.models import Role -from permissions.tests.literals import TEST_ROLE_LABEL -from permissions.tests.mixins import RoleTestCaseMixin -from user_management.tests.literals import ( +from mayan.apps.acls.models import AccessControlList +from mayan.apps.permissions.models import Role +from mayan.apps.permissions.tests.literals import TEST_ROLE_LABEL +from mayan.apps.permissions.tests.mixins import RoleTestCaseMixin +from mayan.apps.user_management.tests.literals import ( TEST_ADMIN_PASSWORD, TEST_ADMIN_USERNAME, TEST_ADMIN_EMAIL, TEST_GROUP_NAME, TEST_USER_EMAIL, TEST_USER_USERNAME, TEST_USER_PASSWORD ) diff --git a/mayan/apps/acls/tests/test_actions.py b/mayan/apps/acls/tests/test_actions.py index c99d9f85b1..f638fef451 100644 --- a/mayan/apps/acls/tests/test_actions.py +++ b/mayan/apps/acls/tests/test_actions.py @@ -2,8 +2,8 @@ from __future__ import unicode_literals from django.contrib.contenttypes.models import ContentType -from document_states.tests.test_actions import ActionTestCase -from documents.permissions import permission_document_view +from mayan.apps.document_states.tests.test_actions import ActionTestCase +from mayan.apps.documents.permissions import permission_document_view from ..workflow_actions import GrantAccessAction, RevokeAccessAction diff --git a/mayan/apps/acls/tests/test_api.py b/mayan/apps/acls/tests/test_api.py index 9e086277dd..49e8cd53d2 100644 --- a/mayan/apps/acls/tests/test_api.py +++ b/mayan/apps/acls/tests/test_api.py @@ -5,10 +5,10 @@ from django.test import override_settings from rest_framework import status -from documents.permissions import permission_document_view -from documents.tests import DocumentTestMixin -from permissions.tests.literals import TEST_ROLE_LABEL -from rest_api.tests import BaseAPITestCase +from mayan.apps.documents.permissions import permission_document_view +from mayan.apps.documents.tests import DocumentTestMixin +from mayan.apps.permissions.tests.literals import TEST_ROLE_LABEL +from mayan.apps.rest_api.tests import BaseAPITestCase from ..models import AccessControlList from ..permissions import permission_acl_view diff --git a/mayan/apps/acls/tests/test_links.py b/mayan/apps/acls/tests/test_links.py index 0ccc5ca63c..ec8a9e2ea7 100644 --- a/mayan/apps/acls/tests/test_links.py +++ b/mayan/apps/acls/tests/test_links.py @@ -3,7 +3,7 @@ from __future__ import unicode_literals from django.contrib.contenttypes.models import ContentType from django.urls import reverse -from documents.tests import GenericDocumentViewTestCase +from mayan.apps.documents.tests import GenericDocumentViewTestCase from ..links import ( link_acl_delete, link_acl_list, link_acl_create, link_acl_permissions diff --git a/mayan/apps/acls/tests/test_models.py b/mayan/apps/acls/tests/test_models.py index 691d35553b..1f5e0beaf2 100644 --- a/mayan/apps/acls/tests/test_models.py +++ b/mayan/apps/acls/tests/test_models.py @@ -3,10 +3,10 @@ from __future__ import absolute_import, unicode_literals from django.core.exceptions import PermissionDenied from django.test import override_settings -from common.tests import BaseTestCase -from documents.models import Document, DocumentType -from documents.permissions import permission_document_view -from documents.tests import ( +from mayan.apps.common.tests import BaseTestCase +from mayan.apps.documents.models import Document, DocumentType +from mayan.apps.documents.permissions import permission_document_view +from mayan.apps.documents.tests import ( TEST_SMALL_DOCUMENT_PATH, TEST_DOCUMENT_TYPE_LABEL, TEST_DOCUMENT_TYPE_2_LABEL ) diff --git a/mayan/apps/acls/tests/test_views.py b/mayan/apps/acls/tests/test_views.py index 3784792fe0..38f98f0d5d 100644 --- a/mayan/apps/acls/tests/test_views.py +++ b/mayan/apps/acls/tests/test_views.py @@ -2,7 +2,7 @@ from __future__ import absolute_import, unicode_literals from django.contrib.contenttypes.models import ContentType -from documents.tests import GenericDocumentViewTestCase +from mayan.apps.documents.tests import GenericDocumentViewTestCase from ..models import AccessControlList from ..permissions import permission_acl_edit, permission_acl_view diff --git a/mayan/apps/acls/views.py b/mayan/apps/acls/views.py index efd3becad7..79d1b496fb 100644 --- a/mayan/apps/acls/views.py +++ b/mayan/apps/acls/views.py @@ -11,12 +11,12 @@ from django.urls import reverse from django.utils.encoding import force_text from django.utils.translation import ugettext_lazy as _ -from common.views import ( +from mayan.apps.common.views import ( AssignRemoveView, SingleObjectCreateView, SingleObjectDeleteView, SingleObjectListView ) -from permissions import PermissionNamespace, Permission -from permissions.models import StoredPermission +from mayan.apps.permissions import PermissionNamespace, Permission +from mayan.apps.permissions.models import StoredPermission from .classes import ModelPermission from .icons import icon_acl_list diff --git a/mayan/apps/acls/workflow_actions.py b/mayan/apps/acls/workflow_actions.py index 60cc5838f0..1843f73745 100644 --- a/mayan/apps/acls/workflow_actions.py +++ b/mayan/apps/acls/workflow_actions.py @@ -7,10 +7,10 @@ from django.contrib.contenttypes.models import ContentType from django.core.exceptions import ValidationError from django.utils.translation import ugettext_lazy as _ -from acls.models import AccessControlList -from document_states.classes import WorkflowAction -from permissions.classes import Permission -from permissions.models import Role +from mayan.apps.acls.models import AccessControlList +from mayan.apps.document_states.classes import WorkflowAction +from mayan.apps.permissions.classes import Permission +from mayan.apps.permissions.models import Role from .classes import ModelPermission from .permissions import permission_acl_edit diff --git a/mayan/apps/appearance/__init__.py b/mayan/apps/appearance/__init__.py index 627f641acf..ddf88f7515 100644 --- a/mayan/apps/appearance/__init__.py +++ b/mayan/apps/appearance/__init__.py @@ -1,3 +1,3 @@ from __future__ import unicode_literals -default_app_config = 'appearance.apps.AppearanceApp' +default_app_config = 'mayan.apps.appearance.apps.AppearanceApp' diff --git a/mayan/apps/appearance/apps.py b/mayan/apps/appearance/apps.py index b8781b2023..f32a9a88b2 100644 --- a/mayan/apps/appearance/apps.py +++ b/mayan/apps/appearance/apps.py @@ -2,13 +2,13 @@ from __future__ import unicode_literals from django.utils.translation import ugettext_lazy as _ -from common import MayanAppConfig +from mayan.apps.common import MayanAppConfig from .licenses import * # NOQA class AppearanceApp(MayanAppConfig): - name = 'appearance' + name = 'mayan.apps.appearance' verbose_name = _('Appearance') def ready(self): diff --git a/mayan/apps/appearance/licenses.py b/mayan/apps/appearance/licenses.py index 0f4180e2d0..db12e997c9 100644 --- a/mayan/apps/appearance/licenses.py +++ b/mayan/apps/appearance/licenses.py @@ -1,6 +1,6 @@ from __future__ import unicode_literals -from common.classes import Package +from mayan.apps.common.classes import Package Package(label='Bootstrap', license_text=''' The MIT License (MIT) diff --git a/mayan/apps/appearance/settings.py b/mayan/apps/appearance/settings.py index ebcc2619ac..5a53ef6719 100644 --- a/mayan/apps/appearance/settings.py +++ b/mayan/apps/appearance/settings.py @@ -2,7 +2,7 @@ from __future__ import unicode_literals from django.utils.translation import ugettext_lazy as _ -from smart_settings import Namespace +from mayan.apps.smart_settings import Namespace from .literals import DEFAULT_MAXIMUM_TITLE_LENGTH diff --git a/mayan/apps/appearance/templates/appearance/about.html b/mayan/apps/appearance/templates/appearance/about.html index 3a553b3e70..2bb43b1117 100644 --- a/mayan/apps/appearance/templates/appearance/about.html +++ b/mayan/apps/appearance/templates/appearance/about.html @@ -60,14 +60,14 @@ {% smart_setting 'COMMON_PROJECT_TITLE' as setting_project_title %} {% project_information '__title__' as project_title %} - {% get_icon 'common.icons.icon_documentation' as icon_documentation %} - {% get_icon 'common.icons.icon_forum' as icon_forum %} - {% get_icon 'common.icons.icon_social_facebook' as icon_social_facebook %} - {% get_icon 'common.icons.icon_social_paypal' as icon_social_paypal %} - {% get_icon 'common.icons.icon_social_twitter' as icon_social_twitter %} - {% get_icon 'common.icons.icon_social_instagram' as icon_social_instagram %} - {% get_icon 'common.icons.icon_source_code' as icon_source_code %} - {% get_icon 'common.icons.icon_wiki' as icon_wiki %} + {% get_icon 'mayan.apps.common.icons.icon_documentation' as icon_documentation %} + {% get_icon 'mayan.apps.common.icons.icon_forum' as icon_forum %} + {% get_icon 'mayan.apps.common.icons.icon_social_facebook' as icon_social_facebook %} + {% get_icon 'mayan.apps.common.icons.icon_social_paypal' as icon_social_paypal %} + {% get_icon 'mayan.apps.common.icons.icon_social_twitter' as icon_social_twitter %} + {% get_icon 'mayan.apps.common.icons.icon_social_instagram' as icon_social_instagram %} + {% get_icon 'mayan.apps.common.icons.icon_source_code' as icon_source_code %} + {% get_icon 'mayan.apps.common.icons.icon_wiki' as icon_wiki %}

{{ setting_project_title }}

diff --git a/mayan/apps/appearance/templates/navigation/generic_subnavigation.html b/mayan/apps/appearance/templates/navigation/generic_subnavigation.html index 2b0d8abab2..4ae4f99185 100644 --- a/mayan/apps/appearance/templates/navigation/generic_subnavigation.html +++ b/mayan/apps/appearance/templates/navigation/generic_subnavigation.html @@ -1,7 +1,7 @@ {% load common_tags %} {% load navigation_tags %} -{% if link|get_type == "" %} +{% if link|get_type == "" %}