mirror of
https://github.com/paperless-ngx/paperless-ngx.git
synced 2026-01-26 22:49:01 -06:00
Merge fixes
This commit is contained in:
@@ -45,7 +45,7 @@ def revoke_share_link_bundle_permissions(apps, schema_editor):
|
|||||||
class Migration(migrations.Migration):
|
class Migration(migrations.Migration):
|
||||||
dependencies = [
|
dependencies = [
|
||||||
migrations.swappable_dependency(settings.AUTH_USER_MODEL),
|
migrations.swappable_dependency(settings.AUTH_USER_MODEL),
|
||||||
("documents", "1074_workflowrun_deleted_at_workflowrun_restored_at_and_more"),
|
("documents", "0004_remove_document_storage_type"),
|
||||||
]
|
]
|
||||||
|
|
||||||
operations = [
|
operations = [
|
||||||
@@ -632,6 +632,8 @@ def update_document_in_llm_index(document):
|
|||||||
def remove_document_from_llm_index(document):
|
def remove_document_from_llm_index(document):
|
||||||
llm_index_remove_document(document)
|
llm_index_remove_document(document)
|
||||||
|
|
||||||
|
|
||||||
|
@shared_task
|
||||||
def build_share_link_bundle(bundle_id: int):
|
def build_share_link_bundle(bundle_id: int):
|
||||||
try:
|
try:
|
||||||
bundle = (
|
bundle = (
|
||||||
|
|||||||
@@ -2,8 +2,8 @@ from documents.tests.utils import TestMigrations
|
|||||||
|
|
||||||
|
|
||||||
class TestMigrateShareLinkBundlePermissions(TestMigrations):
|
class TestMigrateShareLinkBundlePermissions(TestMigrations):
|
||||||
migrate_from = "1074_workflowrun_deleted_at_workflowrun_restored_at_and_more"
|
migrate_from = "0004_remove_document_storage_type"
|
||||||
migrate_to = "1075_sharelinkbundle"
|
migrate_to = "0005_sharelinkbundle"
|
||||||
|
|
||||||
def setUpBeforeMigration(self, apps):
|
def setUpBeforeMigration(self, apps):
|
||||||
User = apps.get_model("auth", "User")
|
User = apps.get_model("auth", "User")
|
||||||
@@ -24,8 +24,8 @@ class TestMigrateShareLinkBundlePermissions(TestMigrations):
|
|||||||
|
|
||||||
|
|
||||||
class TestReverseMigrateShareLinkBundlePermissions(TestMigrations):
|
class TestReverseMigrateShareLinkBundlePermissions(TestMigrations):
|
||||||
migrate_from = "1075_sharelinkbundle"
|
migrate_from = "0005_sharelinkbundle"
|
||||||
migrate_to = "1074_workflowrun_deleted_at_workflowrun_restored_at_and_more"
|
migrate_to = "0004_remove_document_storage_type"
|
||||||
|
|
||||||
def setUpBeforeMigration(self, apps):
|
def setUpBeforeMigration(self, apps):
|
||||||
User = apps.get_model("auth", "User")
|
User = apps.get_model("auth", "User")
|
||||||
|
|||||||
Reference in New Issue
Block a user