Author: kmorin Date: 2013-07-09 16:20:44 +0200 (Tue, 09 Jul 2013) New Revision: 1123 Url: http://forge.codelutin.com/projects/tutti/repository/revisions/1123 Log: fixes #2855 une erreur sur un poids absent (qui emp?\195?\170che l'?\195?\169l?\195?\169vation) n'est pas remont?\195?\169e dans la liste des erreurs quand on lance la validation Modified: trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/catches/ValidateCruiseOperationsService.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/EditFishingOperationAction.java Modified: trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/catches/ValidateCruiseOperationsService.java =================================================================== --- trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/catches/ValidateCruiseOperationsService.java 2013-07-09 13:55:44 UTC (rev 1122) +++ trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/catches/ValidateCruiseOperationsService.java 2013-07-09 14:20:44 UTC (rev 1123) @@ -236,7 +236,7 @@ String fishingOperationId = fishingOperation.getId(); BatchContainer<SpeciesBatch> rootSpeciesBatch = null; - boolean isCatchBatch = !persistenceService.isFishingOperationWithCatchBatch(fishingOperationId); + boolean isCatchBatch = persistenceService.isFishingOperationWithCatchBatch(fishingOperationId); boolean error = !isCatchBatch; if (isCatchBatch) { Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/EditFishingOperationAction.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/EditFishingOperationAction.java 2013-07-09 13:55:44 UTC (rev 1122) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/EditFishingOperationAction.java 2013-07-09 14:20:44 UTC (rev 1123) @@ -35,6 +35,7 @@ import fr.ifremer.tutti.persistence.entities.referential.Person; import fr.ifremer.tutti.persistence.entities.referential.TuttiLocation; import fr.ifremer.tutti.service.PersistenceService; +import fr.ifremer.tutti.service.TuttiDataContext; import fr.ifremer.tutti.ui.swing.content.operation.catches.ComputeWeightsAction; import fr.ifremer.tutti.ui.swing.content.operation.catches.EditCatchesUI; import fr.ifremer.tutti.ui.swing.content.operation.catches.EditCatchesUIModel; @@ -156,7 +157,7 @@ public void setFishingOperation(FishingOperation fishingOperation) { this.fishingOperation = fishingOperation; - getDataContext().setFishingOperationId(fishingOperation.getId()); + getDataContext().setFishingOperationId(fishingOperation != null ? fishingOperation.getId() : null); } public void setCheckPreviousEdit(boolean checkPreviousEdit) {