Author: kmorin Date: 2014-12-05 14:02:48 +0000 (Fri, 05 Dec 2014) New Revision: 722 Url: http://forge.codelutin.com/projects/faxtomail/repository/revisions/722 Log: fixes #6250 Les pj ne sont pas dans la liste d?\195?\169roulante dans la r?\195?\169ponse quand l'?\195?\169l?\195?\169ment est group?\195?\169 Modified: trunk/faxtomail-persistence/src/main/java/com/franciaflex/faxtomail/persistence/entities/EmailTopiaDao.java 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/demande/DemandeUIModel.java Modified: trunk/faxtomail-persistence/src/main/java/com/franciaflex/faxtomail/persistence/entities/EmailTopiaDao.java =================================================================== --- trunk/faxtomail-persistence/src/main/java/com/franciaflex/faxtomail/persistence/entities/EmailTopiaDao.java 2014-12-05 09:53:15 UTC (rev 721) +++ trunk/faxtomail-persistence/src/main/java/com/franciaflex/faxtomail/persistence/entities/EmailTopiaDao.java 2014-12-05 14:02:48 UTC (rev 722) @@ -581,9 +581,11 @@ EmailGroup emailGroup = email.getEmailGroup(); if (emailGroup != null) { Hibernate.initialize(emailGroup.getEmail()); - // initialize folder of the grouped demand to transmit the grouped emails of the same folder for (Email groupedEmail : emailGroup.getEmail()) { + // initialize folder of the grouped demand to transmit the grouped emails of the same folder Hibernate.initialize(groupedEmail.getMailFolder()); + // initialize the attachments for the attachments in the replies + Hibernate.initialize(groupedEmail.getAttachment()); } } } 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-12-05 09:53:15 UTC (rev 721) +++ trunk/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/EmailServiceImpl.java 2014-12-05 14:02:48 UTC (rev 722) @@ -198,6 +198,7 @@ Collection<Email> emails = emailGroup.getEmail(); for (Email email2 : emails) { Hibernate.initialize(email2.getMailFolder()); + Hibernate.initialize(email2.getAttachment()); } } Modified: trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/DemandeUIModel.java =================================================================== --- trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/DemandeUIModel.java 2014-12-05 09:53:15 UTC (rev 721) +++ trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/DemandeUIModel.java 2014-12-05 14:02:48 UTC (rev 722) @@ -729,6 +729,7 @@ demandeUIModel.setTopiaId(email.getTopiaId()); demandeUIModel.setMailFolder(email.getMailFolder()); demandeUIModel.setDemandStatus(email.getDemandStatus()); + demandeUIModel.loadAttachments(email); groupedDemandes.add(demandeUIModel); } }