Author: kmorin Date: 2014-11-26 19:03:23 +0000 (Wed, 26 Nov 2014) New Revision: 701 Url: http://forge.codelutin.com/projects/faxtomail/repository/revisions/701 Log: fixes #6172 Mauvais envoyeur dans la citation d'un forward sur une r?\195?\169ponse fixes #6171 Le filtre sur les colonnes des tables d'?\195?\169l?\195?\169ments ne fonctionnent pas avec les majuscules Modified: trunk/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/EmailServiceImpl.java trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/MainUI.css trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/DemandeListUIHandler.java trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/replies/DemandRepliesUIHandler.java trunk/faxtomail-ui-web/src/main/java/com/franciaflex/faxtomail/web/job/MailFilterJob.java trunk/pom.xml Modified: trunk/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/EmailServiceImpl.java =================================================================== --- trunk/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/EmailServiceImpl.java 2014-11-26 15:21:23 UTC (rev 700) +++ trunk/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/EmailServiceImpl.java 2014-11-26 19:03:23 UTC (rev 701) @@ -554,7 +554,9 @@ // email.addHistory(transmissionToEdi); // passage en status - email.setDemandStatus(DemandStatus.IN_PROGRESS); + if (email.getDemandStatus() == DemandStatus.UNTREATED) { + email.setDemandStatus(DemandStatus.IN_PROGRESS); + } fieldSet.add(Email.PROPERTY_DEMAND_STATUS); } } @@ -568,7 +570,10 @@ // email.addHistory(transmissionToEdi); // passage en status - email.setDemandStatus(DemandStatus.IN_PROGRESS); + + if (email.getDemandStatus() == DemandStatus.UNTREATED) { + email.setDemandStatus(DemandStatus.IN_PROGRESS); + } fieldSet.add(Email.PROPERTY_DEMAND_STATUS); } } Modified: trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/MainUI.css =================================================================== --- trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/MainUI.css 2014-11-26 15:21:23 UTC (rev 700) +++ trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/MainUI.css 2014-11-26 19:03:23 UTC (rev 701) @@ -82,5 +82,5 @@ #status { showClock: false; - showMemoryStatus: false; + showMemoryStatus: true; } Modified: trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/DemandeListUIHandler.java =================================================================== --- trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/DemandeListUIHandler.java 2014-11-26 15:21:23 UTC (rev 700) +++ trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/DemandeListUIHandler.java 2014-11-26 19:03:23 UTC (rev 701) @@ -299,6 +299,8 @@ ApplicationUIAction<LoadFolderEmailsAction> refreshAction = getContext().getActionFactory().createUIAction(this, LoadFolderEmailsAction.class); rootPane.getActionMap().put(REFRESH_FOLDER_ACTION, refreshAction); + MailFolder folder = getContext().getCurrentMailFolder(); + loadFolderDemands(folder, nodesByFolder); } public void initTableFilter() { Modified: trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/replies/DemandRepliesUIHandler.java =================================================================== --- trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/replies/DemandRepliesUIHandler.java 2014-11-26 15:21:23 UTC (rev 700) +++ trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/replies/DemandRepliesUIHandler.java 2014-11-26 19:03:23 UTC (rev 701) @@ -258,7 +258,7 @@ // XXX: à verifier pour le format, et si on quote ou pas encore le forward String quotedReply = t("faxtomail.reply.message", decorate(reply.getSentDate()), - message.getRecipients(RecipientType.TO)[0].toString(), + message.getFrom()[0].toString(), replyModel.getMessage().replaceAll("\n", "\n> ")); replyModel.setMessage(quotedReply); 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-11-26 15:21:23 UTC (rev 700) +++ trunk/faxtomail-ui-web/src/main/java/com/franciaflex/faxtomail/web/job/MailFilterJob.java 2014-11-26 19:03:23 UTC (rev 701) @@ -296,7 +296,7 @@ if (CollectionUtils.isNotEmpty(filters)) { MailFilter mailFilter = filters.get(0); - // TODO create issue + // see #6161 if (filter == null || mailFilter.getPosition() < filter.getPosition()) { filter = mailFilter; email.setRecipient(recipient); Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2014-11-26 15:21:23 UTC (rev 700) +++ trunk/pom.xml 2014-11-26 19:03:23 UTC (rev 701) @@ -111,7 +111,7 @@ <h2Version>1.3.176</h2Version> <guavaVersion>18.0</guavaVersion> - <jaxxVersion>2.17</jaxxVersion> + <jaxxVersion>2.18-SNAPSHOT</jaxxVersion> <!-- do not upgrade to 1.6.5-1 --> <swingXVersion>1.6.4</swingXVersion> <xworkVersion>2.3.16.3</xworkVersion>