Author: kmorin Date: 2015-01-07 15:00:19 +0000 (Wed, 07 Jan 2015) New Revision: 740 Url: http://forge.codelutin.com/projects/faxtomail/repository/revisions/740 Log: correction de l'archivage depuis la liste Modified: trunk/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/MailFolderServiceImpl.java trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/DemandeUIModel.java Modified: trunk/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/MailFolderServiceImpl.java =================================================================== --- trunk/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/MailFolderServiceImpl.java 2015-01-07 14:12:06 UTC (rev 739) +++ trunk/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/MailFolderServiceImpl.java 2015-01-07 15:00:19 UTC (rev 740) @@ -24,19 +24,7 @@ * #L% */ -import java.util.ArrayList; -import java.util.Collection; -import java.util.HashMap; -import java.util.HashSet; -import java.util.List; -import java.util.Map; -import java.util.Set; - import com.franciaflex.faxtomail.persistence.entities.Email; -import org.apache.commons.collections4.CollectionUtils; -import org.hibernate.Hibernate; -import org.nuiton.util.pagination.PaginationParameter; - import com.franciaflex.faxtomail.persistence.entities.EmailTopiaDao; import com.franciaflex.faxtomail.persistence.entities.FaxToMailUser; import com.franciaflex.faxtomail.persistence.entities.MailFilter; @@ -45,8 +33,18 @@ import com.franciaflex.faxtomail.persistence.entities.MailFolderTopiaDao; import com.franciaflex.faxtomail.persistence.entities.WaitingState; import com.franciaflex.faxtomail.services.FaxToMailServiceSupport; +import org.apache.commons.collections4.CollectionUtils; +import org.hibernate.Hibernate; +import org.nuiton.util.pagination.PaginationParameter; import javax.mail.Address; +import java.util.ArrayList; +import java.util.Collection; +import java.util.HashMap; +import java.util.HashSet; +import java.util.List; +import java.util.Map; +import java.util.Set; /** * @author kmorin - kmorin@codelutin.com @@ -227,6 +225,7 @@ @Override public void fetchFolderAttributes(MailFolder folder) { + Hibernate.initialize(folder.getChildren()); Hibernate.initialize(folder.getFolderTableColumns()); Hibernate.initialize(folder.getRanges()); Hibernate.initialize(folder.getReplyAddresses()); 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 2015-01-07 14:12:06 UTC (rev 739) +++ trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/DemandeUIModel.java 2015-01-07 15:00:19 UTC (rev 740) @@ -260,13 +260,13 @@ @Override public Email toEntity() { Email result = newEntity(); - toBeanBinder.copyExcluding(this, result, Email.PROPERTY_ATTACHMENT); + toBeanBinder.copyExcluding(this, result, Email.PROPERTY_ATTACHMENT, Email.PROPERTY_ORIGINAL_EMAIL); return result; } @Override public Email toEntity(Email entity) { - toBeanBinder.copyExcluding(this, entity, Email.PROPERTY_ATTACHMENT); + toBeanBinder.copyExcluding(this, entity, Email.PROPERTY_ATTACHMENT, Email.PROPERTY_ORIGINAL_EMAIL); return entity; }