matthias/mayan-edms
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Restore use of the .store_body variable accidentally remove in 63a77d0235. Thanks to TheOneValen @TheOneValen for the report.

Browse Source 
Signed-off-by: Roberto Rosario <roberto.rosario.gonzalez@gmail.com>
This commit is contained in:
Roberto Rosario
2018-10-07 04:25:58 -04:00
parent 55c83689d2
commit eeeb246ed7
2 changed files with 35 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
mayan/apps/sources/models.py
View File

@@ -632,18 +632,19 @@ class EmailBaseModel(IntervalBaseModel):
else:
label = 'email_body.txt'
with ContentFile(content=message.body, name=label) as file_object:
documents = source.handle_upload(
document_type=source.document_type,
file_object=file_object,
expand=SOURCE_UNCOMPRESS_CHOICE_N
)
if metadata_dictionary:
for document in documents:
set_bulk_metadata(
document=document,
metadata_dictionary=metadata_dictionary
)
if source.store_body:
with ContentFile(content=message.body, name=label) as file_object:
documents = source.handle_upload(
document_type=source.document_type,
file_object=file_object,
expand=SOURCE_UNCOMPRESS_CHOICE_N
)
if metadata_dictionary:
for document in documents:
set_bulk_metadata(
document=document,
metadata_dictionary=metadata_dictionary
)
class IMAPEmail(EmailBaseModel):

22
mayan/apps/sources/tests/test_models.py
View File

@@ -160,6 +160,28 @@ class EmailFilenameDecodingTestCase(BaseTestCase):
TEST_EMAIL_BASE64_FILENAME_SUBJECT
)
def test_document_upload_no_body(self):
self._create_email_source()
self.source.store_body = False
self.source.save()
EmailBaseModel.process_message(
source=self.source, message_text=TEST_EMAIL_ATTACHMENT_AND_INLINE
)
# Only two attachments, no body document
self.assertEqual(2, Document.objects.count())
def test_document_upload_with_body(self):
self._create_email_source()
EmailBaseModel.process_message(
source=self.source, message_text=TEST_EMAIL_ATTACHMENT_AND_INLINE
)
# Only two attachments and a body document
self.assertEqual(3, Document.objects.count())
@override_settings(OCR_AUTO_OCR=False)
class POP3SourceTestCase(BaseTestCase):