branch feature/7421 updated (b6b6713 -> a0d223a)
This is an automated email from the git hooks/post-receive script. New change to branch feature/7421 in repository faxtomail. See http://git.codelutin.com/faxtomail.git from b6b6713 Affichage des pj inline dans une liste séparée, affcihée ou non grâce à un bouton (refs #7421) new a0d223a détermination de la propriété inline des pj à la réception (refs #7421) The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "adds" were already present in the repository and have only been added to this reference. Detailed log of new commits: commit a0d223a85bb25ad5391a519da66808a28757dae3 Author: Kevin Morin <morin@codelutin.com> Date: Wed Sep 2 15:32:16 2015 +0200 détermination de la propriété inline des pj à la réception (refs #7421) Summary of changes: .../com/franciaflex/faxtomail/services/service/EmailServiceImpl.java | 4 +++- .../faxtomail/ui/swing/content/attachment/AttachmentEditorUI.css | 5 +++-- .../faxtomail/ui/swing/content/demande/DemandeUIModel.java | 2 +- .../src/main/resources/i18n/faxtomail-ui-swing_fr_FR.properties | 3 +-- 4 files changed, 8 insertions(+), 6 deletions(-) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.
This is an automated email from the git hooks/post-receive script. New commit to branch feature/7421 in repository faxtomail. See http://git.codelutin.com/faxtomail.git commit a0d223a85bb25ad5391a519da66808a28757dae3 Author: Kevin Morin <morin@codelutin.com> Date: Wed Sep 2 15:32:16 2015 +0200 détermination de la propriété inline des pj à la réception (refs #7421) --- .../com/franciaflex/faxtomail/services/service/EmailServiceImpl.java | 4 +++- .../faxtomail/ui/swing/content/attachment/AttachmentEditorUI.css | 5 +++-- .../faxtomail/ui/swing/content/demande/DemandeUIModel.java | 2 +- .../src/main/resources/i18n/faxtomail-ui-swing_fr_FR.properties | 3 +-- 4 files changed, 8 insertions(+), 6 deletions(-) diff --git a/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/EmailServiceImpl.java b/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/EmailServiceImpl.java index 5bc93e0..295f589 100644 --- a/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/EmailServiceImpl.java +++ b/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/EmailServiceImpl.java @@ -1894,6 +1894,7 @@ public class EmailServiceImpl extends FaxToMailServiceSupport implements EmailSe name = t("faxtomail.email.content.attachment.plainFileName"); } Attachment attachment = convertTextToPdf(content, name); + attachment.setInlineAttachment(Part.INLINE.equals(disposition)); attachments.add(attachment); } @@ -1926,10 +1927,10 @@ public class EmailServiceImpl extends FaxToMailServiceSupport implements EmailSe } } if (attachment != null) { + attachment.setInlineAttachment(Part.INLINE.equals(disposition)); attachments.add(attachment); } - // else, this is an attachment } else { String fileName = bp.getFileName(); @@ -1972,6 +1973,7 @@ public class EmailServiceImpl extends FaxToMailServiceSupport implements EmailSe attachmentFile.setFilename(fileName); attachment.setOriginalFile(attachmentFile); attachment.setContentId(contentID); + attachment.setInlineAttachment(Part.INLINE.equals(disposition)); // convert attachment if defined by admin convertIfNecessary(attachment); diff --git a/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/attachment/AttachmentEditorUI.css b/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/attachment/AttachmentEditorUI.css index d17f400..7b03af9 100644 --- a/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/attachment/AttachmentEditorUI.css +++ b/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/attachment/AttachmentEditorUI.css @@ -57,9 +57,10 @@ } #inlineAttachmentsHidor { - hideText: { t("faxtomail.attachmentEditor.inlineAttachments.hidor.hideText", model.getInlineAttachments().size()) }; + text: { t("faxtomail.attachmentEditor.inlineAttachments.hidor.text", model.getInlineAttachments().size()) }; + hideText: { t("faxtomail.attachmentEditor.inlineAttachments.hidor.text", model.getInlineAttachments().size()) }; hideTip: { t("faxtomail.attachmentEditor.inlineAttachments.hidor.hideTip", model.getInlineAttachments().size()) }; - showText: { t("faxtomail.attachmentEditor.inlineAttachments.hidor.showText", model.getInlineAttachments().size()) }; + showText: { t("faxtomail.attachmentEditor.inlineAttachments.hidor.text", model.getInlineAttachments().size()) }; showTip: { t("faxtomail.attachmentEditor.inlineAttachments.hidor.showTip", model.getInlineAttachments().size()) }; target: { inlineAttachments }; targetVisible: false; diff --git a/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/DemandeUIModel.java b/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/DemandeUIModel.java index b411796..21a3a08 100644 --- a/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/DemandeUIModel.java +++ b/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/DemandeUIModel.java @@ -967,7 +967,7 @@ public class DemandeUIModel extends AbstractFaxToMailBeanUIModel<Email, DemandeU for (int j = 0; j < multiPartCount; j++) { BodyPart bp = mimeMultipart.getBodyPart(j); - // if it is a text part, the,n this is the email content + // if it is a text part, then this is the email content String disposition = bp.getDisposition(); if (bp.isMimeType("text/*") && !Part.ATTACHMENT.equals(disposition)) { Charset charset = FaxToMailServiceUtils.getCharset(bp); diff --git a/faxtomail-ui-swing/src/main/resources/i18n/faxtomail-ui-swing_fr_FR.properties b/faxtomail-ui-swing/src/main/resources/i18n/faxtomail-ui-swing_fr_FR.properties index 120785f..2d1647b 100644 --- a/faxtomail-ui-swing/src/main/resources/i18n/faxtomail-ui-swing_fr_FR.properties +++ b/faxtomail-ui-swing/src/main/resources/i18n/faxtomail-ui-swing_fr_FR.properties @@ -69,10 +69,9 @@ faxtomail.attachmentEditor.attachments.empty=Aucune pièce jointe faxtomail.attachmentEditor.deleteAttachment.message=Êtes-vous sûr de vouloir supprimer la pièce-jointe %s ? faxtomail.attachmentEditor.deleteAttachment.title=Suppression de pièce-jointe faxtomail.attachmentEditor.field.file=Fichier -faxtomail.attachmentEditor.inlineAttachments.hidor.hideText=Divers (%s) faxtomail.attachmentEditor.inlineAttachments.hidor.hideTip=Cacher les fichiers divers (%s) -faxtomail.attachmentEditor.inlineAttachments.hidor.showText=Divers (%s) faxtomail.attachmentEditor.inlineAttachments.hidor.showTip=Afficher les fichiers divers (%s) +faxtomail.attachmentEditor.inlineAttachments.hidor.text=Divers (%s) faxtomail.attachmentEditor.none.tip=Aucune pièce-jointe faxtomail.attachmentEditor.text=Pièces jointes (%s) faxtomail.attachmentEditor.title=Pièces jointes -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.
participants (1)
-
codelutin.com scm