mirror of
https://github.com/paperless-ngx/paperless-ngx.git
synced 2026-01-22 05:07:05 +01:00
Fix: propagate metadata override created value (#11659)
This commit is contained in:
parent
01c7a345cb
commit
504c824cfe
2 changed files with 5 additions and 3 deletions
|
|
@ -22,7 +22,7 @@ class DocumentMetadataOverrides:
|
|||
document_type_id: int | None = None
|
||||
tag_ids: list[int] | None = None
|
||||
storage_path_id: int | None = None
|
||||
created: datetime.datetime | None = None
|
||||
created: datetime.date | None = None
|
||||
asn: int | None = None
|
||||
owner_id: int | None = None
|
||||
view_users: list[int] | None = None
|
||||
|
|
@ -103,6 +103,7 @@ class DocumentMetadataOverrides:
|
|||
overrides.storage_path_id = doc.storage_path.id if doc.storage_path else None
|
||||
overrides.owner_id = doc.owner.id if doc.owner else None
|
||||
overrides.tag_ids = list(doc.tags.values_list("id", flat=True))
|
||||
overrides.created = doc.created
|
||||
|
||||
overrides.view_users = list(
|
||||
get_users_with_perms(
|
||||
|
|
|
|||
|
|
@ -581,7 +581,7 @@ class TestPDFActions(DirectoriesMixin, TestCase):
|
|||
- Consume file should be called
|
||||
"""
|
||||
doc_ids = [self.doc1.id, self.doc2.id, self.doc3.id]
|
||||
metadata_document_id = self.doc1.id
|
||||
metadata_document_id = self.doc2.id
|
||||
user = User.objects.create(username="test_user")
|
||||
|
||||
result = bulk_edit.merge(
|
||||
|
|
@ -607,7 +607,8 @@ class TestPDFActions(DirectoriesMixin, TestCase):
|
|||
# With metadata_document_id overrides
|
||||
result = bulk_edit.merge(doc_ids, metadata_document_id=metadata_document_id)
|
||||
consume_file_args, _ = mock_consume_file.call_args
|
||||
self.assertEqual(consume_file_args[1].title, "A (merged)")
|
||||
self.assertEqual(consume_file_args[1].title, "B (merged)")
|
||||
self.assertEqual(consume_file_args[1].created, self.doc2.created)
|
||||
self.assertTrue(consume_file_args[1].skip_asn)
|
||||
|
||||
self.assertEqual(result, "OK")
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue