Author: kmorin Date: 2014-11-27 16:05:17 +0000 (Thu, 27 Nov 2014) New Revision: 705 Url: http://forge.codelutin.com/projects/faxtomail/repository/revisions/705 Log: fixes #6192 Le tableau de gammes n'est pas charg?\195?\169 quand on ouvre un ?\195?\169l?\195?\169ment group?\195?\169 Modified: trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/actions/OpenGroupedDemandAction.java Modified: trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/actions/OpenGroupedDemandAction.java =================================================================== --- trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/actions/OpenGroupedDemandAction.java 2014-11-27 13:45:24 UTC (rev 704) +++ trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/actions/OpenGroupedDemandAction.java 2014-11-27 16:05:17 UTC (rev 705) @@ -27,6 +27,7 @@ import com.franciaflex.faxtomail.persistence.entities.Email; import com.franciaflex.faxtomail.persistence.entities.FaxToMailUser; import com.franciaflex.faxtomail.persistence.entities.MailFolder; +import com.franciaflex.faxtomail.persistence.entities.RangeRow; import com.franciaflex.faxtomail.services.FaxToMailServiceContext; import com.franciaflex.faxtomail.services.service.EmailService; import com.franciaflex.faxtomail.services.service.exceptions.AlreadyLockedMailException; @@ -34,6 +35,7 @@ import com.franciaflex.faxtomail.ui.swing.content.MainUIHandler; import com.franciaflex.faxtomail.ui.swing.content.demande.DemandeUIModel; import com.franciaflex.faxtomail.ui.swing.content.demande.DemandesUI; +import com.franciaflex.faxtomail.ui.swing.content.demande.RangeRowModel; import com.franciaflex.faxtomail.ui.swing.content.demande.demandgroup.DemandGroupUI; import com.franciaflex.faxtomail.ui.swing.content.demande.demandgroup.DemandGroupUIHandler; import org.apache.commons.lang3.StringUtils; @@ -41,6 +43,9 @@ import javax.swing.*; +import java.util.ArrayList; +import java.util.Collection; + import static org.nuiton.i18n.I18n.t; /** @@ -152,6 +157,21 @@ takeEmail); demandToOpen.fromEntity(email); + ArrayList<RangeRowModel> validRangeRowModels = new ArrayList<RangeRowModel>(); + Collection<RangeRow> rangeRows = demandToOpen.getRangeRow(); + if (rangeRows != null) { + for (RangeRow rangeRow : rangeRows) { + if (rangeRow != null) { + RangeRowModel rangeRowModel = new RangeRowModel(); + rangeRowModel.fromEntity(rangeRow); + if (rangeRowModel.isValid()) { + validRangeRowModels.add(rangeRowModel); + } + } + } + } + demandToOpen.setValidRangeRowModels(validRangeRowModels); + MailFolder folder = demandToOpen.getMailFolder(); if (demandToOpen.getArchiveDate() != null || !folder.isFolderWritable()