This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository tutti. See http://git.codelutin.com/tutti.git commit 0d85de3b5853ae4f9348009c29bad5aed2511494 Author: Tony CHEMIT <chemit@codelutin.com> Date: Tue Aug 25 16:34:48 2015 +0200 Plus besoin de faire du nettoyage sur les roles lors de la sauvegarde d'une campagne (See #7468) --- .../service/CruisePersistenceServiceImpl.java | 20 -------------------- 1 file changed, 20 deletions(-) diff --git a/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/CruisePersistenceServiceImpl.java b/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/CruisePersistenceServiceImpl.java index 3c2e576..8a126fa 100644 --- a/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/CruisePersistenceServiceImpl.java +++ b/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/CruisePersistenceServiceImpl.java @@ -783,26 +783,6 @@ public class CruisePersistenceServiceImpl extends AbstractPersistenceService imp Map<Integer, VesselPersonFeatures> vesselPersonFeaturesMap = Maps.newLinkedHashMap(); - // On ajoute au dictionnaire les vesselPersonFeatures avec d'autres rôles que les deux gérés par cet écran - // On fait ça car il y a un effet de bord, en faisant un clear sur fishingTrip.getVesselPersonFeatures() - // on supprime du coup tous rôles autres (ceux par exemple du rôle saissiseur utilisé sur un trait) - - if (fishingTrip.getVesselPersonFeatures() != null) { - for (VesselPersonFeatures vesselPersonFeatures : fishingTrip.getVesselPersonFeatures()) { - Collection<VesselPersonRole> vesselPersonRoles = vesselPersonFeatures.getVesselPersonRoles(); - vesselPersonRoles.remove(scientificCruiseManagerRole); - vesselPersonRoles.remove(sortRoomManagerRole); - if (!vesselPersonRoles.isEmpty()) { - - // On doit conserver ce vesselPersonFeatures, il utilise d'autre rôles - Integer personId = vesselPersonFeatures.getPerson().getId(); - vesselPersonFeaturesMap.put(personId, vesselPersonFeatures); - - } - } - - } - short personRankOrder = 1; // Head of Mission Managers (act as rankOrder 0) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.