This is an automated email from the git hooks/post-receive script. New commit to branch faxtomail-2.3.x in repository faxtomail. See https://gitlab.nuiton.org/codelutin/faxtomail.git commit a21a77e9e4deee58039b64c4419744095882b52b Author: Kevin Morin <morin@codelutin.com> Date: Fri Mar 17 15:20:06 2017 +0100 fixes #9095 le pris par n'est pas enregistré quand on imprime depuis la liste --- .../ui/swing/actions/PrintOnDefaultPrinterAction.java | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/actions/PrintOnDefaultPrinterAction.java b/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/actions/PrintOnDefaultPrinterAction.java index 5b5a16a..94b4fd5 100644 --- a/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/actions/PrintOnDefaultPrinterAction.java +++ b/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/actions/PrintOnDefaultPrinterAction.java @@ -25,7 +25,6 @@ package com.franciaflex.faxtomail.ui.swing.actions; */ import com.franciaflex.faxtomail.persistence.entities.AttachmentFile; -import com.franciaflex.faxtomail.persistence.entities.Configuration; import com.franciaflex.faxtomail.persistence.entities.Email; import com.franciaflex.faxtomail.persistence.entities.FaxToMailUser; import com.franciaflex.faxtomail.persistence.entities.HistoryType; @@ -79,11 +78,10 @@ public class PrintOnDefaultPrinterAction extends AbstractFaxToMailAction { public void doAction() throws Exception { FaxToMailUser currentUser = getContext().getCurrentUser(); AbstractFaxToMailUIHandler handler = (AbstractFaxToMailUIHandler) getHandler(); - Configuration config = getContext().newServiceContext().getConfigurationService().getConfiguration(); int printedFileNb = 0; Multimap<DemandeUIModel, AttachmentFile> nonPrintedAttachment = HashMultimap.create(); - notPrintableDemands = new ArrayList<DemandeUIModel>(); + notPrintableDemands = new ArrayList<>(); List<DemandeUIModel> orderedDemands = new ArrayList<>(attachmentsToPrintByDemand.keySet()); // order the demands by reception date @@ -94,6 +92,10 @@ public class PrintOnDefaultPrinterAction extends AbstractFaxToMailAction { return o1.getReceptionDate().compareTo(o2.getReceptionDate()); } }); + + FaxToMailServiceContext serviceContext = getContext().newServiceContext(); + EmailService emailService = serviceContext.getEmailService(); + for (DemandeUIModel demandeUIModel : orderedDemands) { if(!handler.isActionEnabled(demandeUIModel, MailAction.PRINT)) { @@ -102,14 +104,15 @@ public class PrintOnDefaultPrinterAction extends AbstractFaxToMailAction { } else { if (take && (demandeUIModel.getTakenBy() == null || !takeOnlyIfNotTaken)) { demandeUIModel.setTakenBy(currentUser); + Email persistedEmail = emailService.getFullEmailById(demandeUIModel.getTopiaId()); + Email email = demandeUIModel.toEntity(persistedEmail); + emailService.saveEmail(email, currentUser); } List<String> printedFiles = new ArrayList<String>(); - FaxToMailServiceContext serviceContext = getContext().newServiceContext(); if (printDemandDetails) { // generate details as pdf - EmailService emailService = serviceContext.getEmailService(); Email email = demandeUIModel.toEntity(); final AttachmentFile demandDetailAttachment = emailService.getEmailDetailAsAttachment(email); // print details @@ -133,7 +136,7 @@ public class PrintOnDefaultPrinterAction extends AbstractFaxToMailAction { } } - Email email = serviceContext.getEmailService().addToHistory(demandeUIModel.getTopiaId(), + Email email = emailService.addToHistory(demandeUIModel.getTopiaId(), HistoryType.PRINTING, getContext().getCurrentUser(), new Date(), -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.