branch develop updated (72fba0ca -> 413e8c9e)
This is an automated email from the git hooks/post-receive script. New change to branch develop in repository faxtomail. See https://gitlab.nuiton.org/codelutin/faxtomail.git from 72fba0ca Lors de la reselection d'une demandes verifier que l'index de selection est valide c.f. mail de Quinio : TR: plante FTM FF du 18/17/2018 à 17:40 new 413e8c9e fixes #10045 - Erreur (no Session) lors d'un clic-droit sur éléments que l'on vient de traiter 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 413e8c9e20c0cc6353f0fff9705e2985670e22d0 Author: jcouteau <couteau@codelutin.com> Date: Tue Aug 7 16:21:18 2018 +0200 fixes #10045 - Erreur (no Session) lors d'un clic-droit sur éléments que l'on vient de traiter Summary of changes: .../faxtomail/services/service/EmailServiceImpl.java | 16 ++++++++++------ 1 file changed, 10 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 develop in repository faxtomail. See https://gitlab.nuiton.org/codelutin/faxtomail.git commit 413e8c9e20c0cc6353f0fff9705e2985670e22d0 Author: jcouteau <couteau@codelutin.com> Date: Tue Aug 7 16:21:18 2018 +0200 fixes #10045 - Erreur (no Session) lors d'un clic-droit sur éléments que l'on vient de traiter --- .../faxtomail/services/service/EmailServiceImpl.java | 16 ++++++++++------ 1 file changed, 10 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 277e019c..875017c4 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 @@ -105,7 +105,6 @@ import javax.mail.internet.MimeBodyPart; import javax.mail.internet.MimeMessage; import javax.mail.internet.MimeMultipart; import javax.mail.internet.MimeUtility; -import java.awt.*; import java.awt.image.BufferedImage; import java.io.BufferedWriter; import java.io.ByteArrayOutputStream; @@ -139,7 +138,6 @@ import java.util.Set; import java.util.UUID; import java.util.regex.Pattern; -import static org.nuiton.i18n.I18n.init; import static org.nuiton.i18n.I18n.t; /** @@ -188,6 +186,12 @@ public class EmailServiceImpl extends FaxToMailServiceSupport implements EmailSe Hibernate.initialize(email.getReplies()); Hibernate.initialize(email.getAttachment()); Hibernate.initialize(email.getMailFolder()); + //should also initialize parents + MailFolder folder = email.getMailFolder(); + while (folder.getParent() != null){ + folder = folder.getParent(); + Hibernate.initialize(folder); + } Collection<History> histories = email.getHistory(); if (histories != null) { for (History history : histories) { @@ -493,7 +497,7 @@ public class EmailServiceImpl extends FaxToMailServiceSupport implements EmailSe AttachmentFile originalFile = null; AttachmentFile editedFile = null; Collection<GeneratedPDFPage> pages = null; - // dans tout les cas, les pieces jointes courante de l'attchent prévale + // dans tout les cas, les pieces jointes courantes de l'attachment prévalent // sur celles en base if (attachment.getOriginalFile() != null) { originalFile = attachment.getOriginalFile(); @@ -947,12 +951,12 @@ public class EmailServiceImpl extends FaxToMailServiceSupport implements EmailSe // if no lock found, create new one if (mailLock == null) { - // dévérouillage automatique des mails qui ne font pas partit du même group que celui du mail + // déverrouillage automatique des mails qui ne font pas partie du même group que celui du mail // qui vient d'être locké List<MailLock> mailLocksToRemove; if (email.getEmailGroup() != null) { - // si le mail courant à un group, ont déverrouilles tous les mails - // qui ne porte pas sur le même groupe + // si le mail courant a un group, on déverrouille tous les mails + // qui ne portent pas sur le même groupe mailLocksToRemove = mailLockDao.forLockByEquals(currentUser) .addNotEquals(MailLock.PROPERTY_LOCK_ON + "." + Email.PROPERTY_EMAIL_GROUP, email.getEmailGroup()).findAll(); } else { -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.
participants (1)
-
codelutin.com scm