paradizelost/paperless-ngx
1
0
Fork 0
mirror of https://github.com/paperless-ngx/paperless-ngx.git synced 2025-04-21 10:29:29 -05:00
Code Issues Packages Projects Releases Wiki Activity

Simplify this

Browse Source
This commit is contained in:
shamoon 2025-01-30 14:30:08 -08:00
parent dcf40ba5eb
commit 45884989ed
2 changed files with 19 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
src/documents/bulk_edit.py
View File

@ -181,22 +181,25 @@ def modify_custom_fields(
if custom_field.data_type == CustomField.FieldDataType.DOCUMENTLINK: if custom_field.data_type == CustomField.FieldDataType.DOCUMENTLINK:
doc = Document.objects.get(id=doc_id) doc = Document.objects.get(id=doc_id)
reflect_doclinks(doc, custom_field, value) reflect_doclinks(doc, custom_field, value)
remove_fields = CustomField.objects.filter(id__in=remove_custom_fields).distinct()
for remove_field in remove_fields: # For doc link fields that are being removed, remove symmetrical links
if remove_field.data_type == CustomField.FieldDataType.DOCUMENTLINK: for doclink_field in CustomField.objects.filter(
# Remove symmetrical links from target documents id__in=remove_custom_fields,
for doc_id in affected_docs: data_type=CustomField.FieldDataType.DOCUMENTLINK,
target_doc_instance = CustomFieldInstance.objects.filter( ).distinct():
document_id=doc_id, for target_doc_instance in CustomFieldInstance.objects.filter(
field=remove_field, document_id__in=affected_docs,
).first() field=doclink_field,
if target_doc_instance and target_doc_instance.value: value_document_ids__isnull=False,
):
for target_doc_id in target_doc_instance.value: for target_doc_id in target_doc_instance.value:
remove_doclink( remove_doclink(
document=Document.objects.get(id=doc_id), document=Document.objects.get(id=target_doc_instance.document.id),
field=remove_field, field=doclink_field,
target_doc_id=target_doc_id, target_doc_id=target_doc_id,
) )
# Finally, remove the custom fields
CustomFieldInstance.objects.filter( CustomFieldInstance.objects.filter(
document_id__in=affected_docs, document_id__in=affected_docs,
field_id__in=remove_custom_fields, field_id__in=remove_custom_fields,

2
src/documents/tests/test_bulk_edit.py
View File

@ -312,7 +312,6 @@ class TestBulkEdit(DirectoriesMixin, TestCase):
[self.doc3.id], [self.doc3.id],
) )
# assert reflect document link # assert reflect document link
self.doc3.refresh_from_db()
self.assertEqual( self.assertEqual(
self.doc3.custom_fields.first().value, self.doc3.custom_fields.first().value,
[self.doc2.id, self.doc1.id], [self.doc2.id, self.doc1.id],
@ -328,7 +327,6 @@ class TestBulkEdit(DirectoriesMixin, TestCase):
add_custom_fields={}, add_custom_fields={},
remove_custom_fields=[cf3.id], remove_custom_fields=[cf3.id],
) )
self.doc1.refresh_from_db()
self.assertNotIn( self.assertNotIn(
self.doc3.id, self.doc3.id,
self.doc1.custom_fields.filter(field=cf3).first().value, self.doc1.custom_fields.filter(field=cf3).first().value,