Author: kmorin Date: 2014-09-24 15:26:13 +0200 (Wed, 24 Sep 2014) New Revision: 642 Url: http://forge.codelutin.com/projects/faxtomail/repository/revisions/642 Log: - ne pas g?\195?\169n?\195?\169rer la version text plain du mail en pdf s'il existe une version html - retourner ?\195?\160 la page 1 quand on filtre Modified: trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/DemandeListTableFilter.java trunk/faxtomail-ui-web/src/main/java/com/franciaflex/faxtomail/web/job/MailFilterJob.java Modified: trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/DemandeListTableFilter.java =================================================================== --- trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/DemandeListTableFilter.java 2014-09-24 12:43:29 UTC (rev 641) +++ trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/DemandeListTableFilter.java 2014-09-24 13:26:13 UTC (rev 642) @@ -274,6 +274,8 @@ protected void executeFilter() { FaxToMailUIContext context = handler.getContext(); + handler.getModel().resetPaginationParameter(); + LoadFolderEmailsAction loadFolderEmailsAction = context.getActionFactory().createLogicAction(handler, LoadFolderEmailsAction.class); Modified: trunk/faxtomail-ui-web/src/main/java/com/franciaflex/faxtomail/web/job/MailFilterJob.java =================================================================== --- trunk/faxtomail-ui-web/src/main/java/com/franciaflex/faxtomail/web/job/MailFilterJob.java 2014-09-24 12:43:29 UTC (rev 641) +++ trunk/faxtomail-ui-web/src/main/java/com/franciaflex/faxtomail/web/job/MailFilterJob.java 2014-09-24 13:26:13 UTC (rev 642) @@ -465,6 +465,14 @@ } Attachment attachment = convertHTMLToPdf(attachments, htmlContent, t("faxtomail.email.content.attachment.htmlfileName")); if (attachment != null) { + //remove text plain attachement if exists, to avoid having twice the mail content in the attachments + String plainTextFileName = t("faxtomail.email.content.attachment.plainfileName") + ".pdf"; + for (Attachment a : attachments) { + if (plainTextFileName.equals(a.getOriginalFileName())) { + attachments.remove(a); + break; + } + } attachments.add(attachment); } }