Merge permissions

diff --git a/src/documents/signals/handlers.py b/src/documents/signals/handlers.py
index 0148165374c4ecc0fc91a0c09bf2dffba3a47321..cdfb6437e846530268790d8e6c3f397f5238828e 100644 (file)
--- a/src/documents/signals/handlers.py
+++ b/src/documents/signals/handlers.py
@@ -28,8 +28,6 @@ from documents.file_handling import create_source_path_directory
 from documents.file_handling import delete_empty_directories
 from documents.file_handling import generate_unique_filename
 from documents.mail import send_email
-from documents.permissions import get_objects_for_user_owner_aware
-from documents.permissions import set_permissions_for_object
 from documents.templating.workflows import parse_w_workflow_placeholders
 from paperless import matching
 from paperless.models import Correspondent
@@ -45,6 +43,8 @@ from paperless.models import Workflow
 from paperless.models import WorkflowAction
 from paperless.models import WorkflowRun
 from paperless.models import WorkflowTrigger
+from paperless.permissions import get_objects_for_user_owner_aware
+from paperless.permissions import set_permissions_for_object
 
 if TYPE_CHECKING:
     from pathlib import Path

diff --git a/src/paperless/bulk_edit.py b/src/paperless/bulk_edit.py
index 55cd357a784f2d8e2a36d4296a68c11c1e6077a6..cebe091d18ad9913254c5fbacd6954220cb3c273 100644 (file)
--- a/src/paperless/bulk_edit.py
+++ b/src/paperless/bulk_edit.py
@@ -16,7 +16,6 @@ from django.conf import settings
 from django.db.models import Q
 from django.utils import timezone
 
-from documents.permissions import set_permissions_for_object
 from documents.plugins.helpers import DocumentsStatusManager
 from documents.tasks import bulk_update_documents
 from documents.tasks import consume_file
@@ -30,6 +29,7 @@ from paperless.models import CustomFieldInstance
 from paperless.models import Document
 from paperless.models import DocumentType
 from paperless.models import StoragePath
+from paperless.permissions import set_permissions_for_object
 
 if TYPE_CHECKING:
     from django.contrib.auth.models import User

diff --git a/src/paperless/consumer.py b/src/paperless/consumer.py
index 45c08196ace9b918c21ce871191d9c851647d57c..50a9eb9072543e3d30c5bc5b6501eb58c65ca3e9 100644 (file)
--- a/src/paperless/consumer.py
+++ b/src/paperless/consumer.py
@@ -22,7 +22,6 @@ from documents.parsers import DocumentParser
 from documents.parsers import ParseError
 from documents.parsers import get_parser_class_for_mime_type
 from documents.parsers import parse_date
-from documents.permissions import set_permissions_for_object
 from documents.plugins.base import AlwaysRunPluginMixin
 from documents.plugins.base import ConsumeTaskPlugin
 from documents.plugins.base import NoCleanupPluginMixin
@@ -44,6 +43,7 @@ from paperless.models import DocumentType
 from paperless.models import StoragePath
 from paperless.models import Tag
 from paperless.models import WorkflowTrigger
+from paperless.permissions import set_permissions_for_object
 from paperless.utils import copy_basic_file_stats
 from paperless.utils import copy_file_with_basic_stats
 from paperless.utils import run_subprocess

diff --git a/src/paperless/matching.py b/src/paperless/matching.py
index c3cc3ea0f7205e05a0709d013778e08e31af6f87..5be8fb447c2ede02c8bd5c19570f372a84f4d6a9 100644 (file)
--- a/src/paperless/matching.py
+++ b/src/paperless/matching.py
@@ -5,7 +5,6 @@ import re
 from fnmatch import fnmatch
 from typing import TYPE_CHECKING
 
-from documents.permissions import get_objects_for_user_owner_aware
 from paperless.data_models import ConsumableDocument
 from paperless.data_models import DocumentSource
 from paperless.models import Correspondent
@@ -16,6 +15,7 @@ from paperless.models import StoragePath
 from paperless.models import Tag
 from paperless.models import Workflow
 from paperless.models import WorkflowTrigger
+from paperless.permissions import get_objects_for_user_owner_aware
 
 if TYPE_CHECKING:
     from documents.classifier import DocumentClassifier

diff --git a/src/documents/permissions.py b/src/paperless/permissions.py
similarity index 100%
rename from src/documents/permissions.py
rename to src/paperless/permissions.py

diff --git a/src/paperless/serialisers.py b/src/paperless/serialisers.py
index 4c3a83a2474c525bd4e7cbe7650f02a1fea240b5..12dfc1c8845a4edbdc7933ed4d39c7298729c7f6 100644 (file)
--- a/src/paperless/serialisers.py
+++ b/src/paperless/serialisers.py
@@ -36,8 +36,6 @@ if settings.AUDIT_LOG_ENABLED:
 
 
 from documents.parsers import is_mime_type_supported
-from documents.permissions import get_groups_with_only_permission
-from documents.permissions import set_permissions_for_object
 from documents.templating.filepath import validate_filepath_template_and_render
 from documents.templating.utils import convert_format_str_to_template_format
 from paperless import bulk_edit
@@ -61,6 +59,8 @@ from paperless.models import WorkflowAction
 from paperless.models import WorkflowActionEmail
 from paperless.models import WorkflowActionWebhook
 from paperless.models import WorkflowTrigger
+from paperless.permissions import get_groups_with_only_permission
+from paperless.permissions import set_permissions_for_object
 from paperless.validators import uri_validator
 from paperless.validators import url_validator
 

diff --git a/src/paperless/views.py b/src/paperless/views.py
index fdb997226c7e9b93515e9b0f54a6e9ac28d2fd21..f9c54ec27bfdb670dae80ca395055a2e4caf44f2 100644 (file)
--- a/src/paperless/views.py
+++ b/src/paperless/views.py
@@ -120,12 +120,6 @@ from documents.filters import TagFilterSet
 from documents.mail import send_email
 from documents.parsers import get_parser_class_for_mime_type
 from documents.parsers import parse_date_generator
-from documents.permissions import PaperlessAdminPermissions
-from documents.permissions import PaperlessNotePermissions
-from documents.permissions import PaperlessObjectPermissions
-from documents.permissions import get_objects_for_user_owner_aware
-from documents.permissions import has_perms_owner_aware
-from documents.permissions import set_permissions_for_object
 from documents.schema import generate_object_with_permissions_schema
 from documents.signals import document_updated
 from documents.tasks import consume_file
@@ -165,6 +159,12 @@ from paperless.models import UiSettings
 from paperless.models import Workflow
 from paperless.models import WorkflowAction
 from paperless.models import WorkflowTrigger
+from paperless.permissions import PaperlessAdminPermissions
+from paperless.permissions import PaperlessNotePermissions
+from paperless.permissions import PaperlessObjectPermissions
+from paperless.permissions import get_objects_for_user_owner_aware
+from paperless.permissions import has_perms_owner_aware
+from paperless.permissions import set_permissions_for_object
 from paperless.serialisers import AcknowledgeTasksViewSerializer
 from paperless.serialisers import ApplicationConfigurationSerializer
 from paperless.serialisers import BulkDownloadSerializer

diff --git a/src/paperless_mail/views.py b/src/paperless_mail/views.py
index 5850ae78f5ae706003aa7402e224fce8a95a7c99..62a25c60c87fd3ae1b1868e57eff91bb2adbf9a7 100644 (file)
--- a/src/paperless_mail/views.py
+++ b/src/paperless_mail/views.py
@@ -18,7 +18,7 @@ from rest_framework.response import Response
 from rest_framework.viewsets import ModelViewSet
 
 from documents.filters import ObjectOwnedOrGrantedPermissionsFilter
-from documents.permissions import PaperlessObjectPermissions
+from paperless.permissions import PaperlessObjectPermissions
 from paperless.views import PassUserMixin
 from paperless.views import StandardPagination
 from paperless_mail.mail import MailError