Cutlery/paperless-ngx
1
0
Fork 0
mirror of https://github.com/paperless-ngx/paperless-ngx.git synced 2025-10-30 18:22:40 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #2808 from paperless-ngx/bugfix-database-locked-on-permission-change

Browse Source 
fix database locked error
This commit is contained in:
Jonas Winkler 2023-03-04 16:25:51 +01:00 committed by GitHub
commit db9733f0d5
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 1 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/documents/bulk_edit.py
View File

@ -8,7 +8,6 @@ from documents.models import StoragePath
from documents.permissions import set_permissions_for_object from documents.permissions import set_permissions_for_object
from documents.tasks import bulk_update_documents from documents.tasks import bulk_update_documents
from documents.tasks import update_document_archive_file from documents.tasks import update_document_archive_file
from documents.tasks import update_owner_for_object
def set_correspondent(doc_ids, correspondent): def set_correspondent(doc_ids, correspondent):
@ -136,7 +135,7 @@ def set_permissions(doc_ids, set_permissions, owner=None):
qs = Document.objects.filter(id__in=doc_ids) qs = Document.objects.filter(id__in=doc_ids)
update_owner_for_object.delay(document_ids=doc_ids, owner=owner) qs.update(owner=owner)
for doc in qs: for doc in qs:
set_permissions_for_object(set_permissions, doc) set_permissions_for_object(set_permissions, doc)

10
src/documents/tasks.py
View File

@ -13,7 +13,6 @@ from asgiref.sync import async_to_sync
from celery import shared_task from celery import shared_task
from channels.layers import get_channel_layer from channels.layers import get_channel_layer
from django.conf import settings from django.conf import settings
from django.contrib.auth.models import User
from django.db import transaction from django.db import transaction
from django.db.models.signals import post_save from django.db.models.signals import post_save
from documents import barcodes from documents import barcodes
@ -312,12 +311,3 @@ def update_document_archive_file(document_id):
) )
finally: finally:
parser.cleanup() parser.cleanup()
@shared_task
def update_owner_for_object(document_ids, owner):
documents = Document.objects.filter(id__in=document_ids)
ownerUser = User.objects.get(pk=owner) if owner is not None else None
for document in documents:
document.owner = ownerUser if owner is not None else None
document.save()