Merge bulk edit

diff --git a/src/documents/tests/test_api_search.py b/src/documents/tests/test_api_search.py
index da2fe2b7bac64158230806911b77aadd1d7e9abb..e49e358b4d78798baa6f7d095dedcbeae594f8c4 100644 (file)
--- a/src/documents/tests/test_api_search.py
+++ b/src/documents/tests/test_api_search.py
@@ -15,8 +15,8 @@ from rest_framework.test import APITestCase
 from whoosh.writing import AsyncWriter
 
 from documents import index
-from documents.bulk_edit import set_permissions
 from documents.tests.utils import DirectoriesMixin
+from paperless.bulk_edit import set_permissions
 from paperless.models import Correspondent
 from paperless.models import CustomField
 from paperless.models import CustomFieldInstance

diff --git a/src/documents/tests/test_bulk_edit.py b/src/documents/tests/test_bulk_edit.py
index 691b80e4668a927e6b55cdf3ae401fcd2f4121a4..ae283a7869796f04b0c6007fcdacc1e85fa471ea 100644 (file)
--- a/src/documents/tests/test_bulk_edit.py
+++ b/src/documents/tests/test_bulk_edit.py
@@ -9,8 +9,8 @@ from guardian.shortcuts import assign_perm
 from guardian.shortcuts import get_groups_with_perms
 from guardian.shortcuts import get_users_with_perms
 
-from documents import bulk_edit
 from documents.tests.utils import DirectoriesMixin
+from paperless import bulk_edit
 from paperless.models import Correspondent
 from paperless.models import CustomField
 from paperless.models import CustomFieldInstance

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

diff --git a/src/paperless/serialisers.py b/src/paperless/serialisers.py
index 7bad65f943a468e125e1e9ddd87bddd4c5854ff2..4c3a83a2474c525bd4e7cbe7650f02a1fea240b5 100644 (file)
--- a/src/paperless/serialisers.py
+++ b/src/paperless/serialisers.py
@@ -35,12 +35,12 @@ if settings.AUDIT_LOG_ENABLED:
     from auditlog.context import set_actor
 
 
-from documents import bulk_edit
 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
 from paperless.data_models import DocumentSource
 from paperless.models import Correspondent
 from paperless.models import CustomField

diff --git a/src/paperless/views.py b/src/paperless/views.py
index 7d650521e3a22b05ff304a3af3fe3ba72c97458d..2fd35d149f6605eca7cfb84b7ed97b0b0a399968 100644 (file)
--- a/src/paperless/views.py
+++ b/src/paperless/views.py
@@ -89,7 +89,6 @@ from rest_framework.viewsets import ModelViewSet
 from rest_framework.viewsets import ReadOnlyModelViewSet
 from rest_framework.viewsets import ViewSet
 
-from documents import bulk_edit
 from documents import index
 from documents.bulk_download import ArchiveOnlyStrategy
 from documents.bulk_download import OriginalAndArchiveStrategy
@@ -137,6 +136,7 @@ from documents.tasks import index_optimize
 from documents.tasks import sanity_check
 from documents.tasks import train_classifier
 from documents.templating.filepath import validate_filepath_template_and_render
+from paperless import bulk_edit
 from paperless import version
 from paperless.celery import app as celery_app
 from paperless.config import GeneralConfig