From 531cda52b5525b94ea569df96980553e034c6f26 Mon Sep 17 00:00:00 2001 From: shamoon <4887959+shamoon@users.noreply.github.com> Date: Tue, 8 Apr 2025 16:30:13 -0700 Subject: [PATCH] Merge bulk edit --- src/documents/tests/test_api_search.py | 2 +- src/documents/tests/test_bulk_edit.py | 2 +- src/{documents => paperless}/bulk_edit.py | 0 src/paperless/serialisers.py | 2 +- src/paperless/views.py | 2 +- 5 files changed, 4 insertions(+), 4 deletions(-) rename src/{documents => paperless}/bulk_edit.py (100%) diff --git a/src/documents/tests/test_api_search.py b/src/documents/tests/test_api_search.py index da2fe2b7b..e49e358b4 100644 --- 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 691b80e46..ae283a786 100644 --- 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 7bad65f94..4c3a83a24 100644 --- 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 7d650521e..2fd35d149 100644 --- 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