This is an automated email from the git hooks/post-receive script. New commit to branch feature/9096_print_only_one_content in repository faxtomail. See https://gitlab.nuiton.org/codelutin/faxtomail.git commit be551e938bf581f1bde80f7a94f51841e2d50799 Author: Kevin Morin <morin@codelutin.com> Date: Mon Apr 3 16:48:02 2017 +0200 refs #9096 #9100 #9104 ajout des configurations --- faxtomail-persistence/src/main/xmi/faxtomail.zargo | Bin 35918 -> 36206 bytes ...attachments_mailContentWithInlineAttachments.sql | 11 +++++++++++ .../h2/V2_4_170403_1__add_showAttachmentPreview.sql | 4 ++++ ...attachments_mailContentWithInlineAttachments.sql | 15 +++++++++++++++ .../V2_4_170403_1__add_showAttachmentPreview.sql | 5 +++++ pom.xml | 2 +- 6 files changed, 36 insertions(+), 1 deletion(-) diff --git a/faxtomail-persistence/src/main/xmi/faxtomail.zargo b/faxtomail-persistence/src/main/xmi/faxtomail.zargo index 87a6572..7bdf00c 100644 Binary files a/faxtomail-persistence/src/main/xmi/faxtomail.zargo and b/faxtomail-persistence/src/main/xmi/faxtomail.zargo differ diff --git a/faxtomail-service/src/main/resources/db/migration/h2/V2_4_170330_2__add_mailContentType_printinlineattachments_mailContentWithInlineAttachments.sql b/faxtomail-service/src/main/resources/db/migration/h2/V2_4_170330_2__add_mailContentType_printinlineattachments_mailContentWithInlineAttachments.sql new file mode 100644 index 0000000..5242bde --- /dev/null +++ b/faxtomail-service/src/main/resources/db/migration/h2/V2_4_170330_2__add_mailContentType_printinlineattachments_mailContentWithInlineAttachments.sql @@ -0,0 +1,11 @@ +-- add mailContentType + +alter table attachment add mailContent boolean; +update attachment set mailContent = 'f'; +update attachment set mailContent = 't' where originalFileName like 'contenu % du mail%.pdf'; + +-- add printinlineattachments and mailContentWithInlineAttachments + +alter table mailfolder add printinlineattachments boolean; +alter table mailfolder add mailContentWithInlineAttachments boolean; +update mailfolder set printinlineattachments = 't', mailContentWithInlineAttachments = 'f' where parent is null; \ No newline at end of file diff --git a/faxtomail-service/src/main/resources/db/migration/h2/V2_4_170403_1__add_showAttachmentPreview.sql b/faxtomail-service/src/main/resources/db/migration/h2/V2_4_170403_1__add_showAttachmentPreview.sql new file mode 100644 index 0000000..a3cb54e --- /dev/null +++ b/faxtomail-service/src/main/resources/db/migration/h2/V2_4_170403_1__add_showAttachmentPreview.sql @@ -0,0 +1,4 @@ +-- add showAttachmentPreview + +alter table mailfolder add showAttachmentPreview boolean; +update mailfolder set showAttachmentPreview = 'f' where parent is null; \ No newline at end of file diff --git a/faxtomail-service/src/main/resources/db/migration/sqlserver/V2_4_170330_2__add_mailContentType_printinlineattachments_mailContentWithInlineAttachments.sql b/faxtomail-service/src/main/resources/db/migration/sqlserver/V2_4_170330_2__add_mailContentType_printinlineattachments_mailContentWithInlineAttachments.sql new file mode 100644 index 0000000..fb02f0f --- /dev/null +++ b/faxtomail-service/src/main/resources/db/migration/sqlserver/V2_4_170330_2__add_mailContentType_printinlineattachments_mailContentWithInlineAttachments.sql @@ -0,0 +1,15 @@ +-- add mailContentType + +alter table attachment add mailContent bit; +GO +update attachment set mailContent = 0; +update attachment set mailContent = 1 where originalFileName like 'contenu % du mail%.pdf'; +GO + +-- add printinlineattachments and mailContentWithInlineAttachments + +alter table mailfolder add printinlineattachments bit; +alter table mailfolder add mailContentWithInlineAttachments bit; +GO +update mailfolder set printinlineattachments = 1, mailContentWithInlineAttachments = 0 where parent is null; +GO \ No newline at end of file diff --git a/faxtomail-service/src/main/resources/db/migration/sqlserver/V2_4_170403_1__add_showAttachmentPreview.sql b/faxtomail-service/src/main/resources/db/migration/sqlserver/V2_4_170403_1__add_showAttachmentPreview.sql new file mode 100644 index 0000000..487e4f5 --- /dev/null +++ b/faxtomail-service/src/main/resources/db/migration/sqlserver/V2_4_170403_1__add_showAttachmentPreview.sql @@ -0,0 +1,5 @@ +-- add showAttachmentPreview +alter table mailfolder add showAttachmentPreview bit; +GO +update mailfolder set showAttachmentPreview = 0 where parent is null; +GO \ No newline at end of file diff --git a/pom.xml b/pom.xml index fad7a54..85f87cd 100644 --- a/pom.xml +++ b/pom.xml @@ -750,7 +750,7 @@ <dependency> <groupId>org.apache.pdfbox</groupId> <artifactId>pdfbox</artifactId> - <version>2.0.1</version> + <version>2.0.5</version> </dependency> <dependency> -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.