branch develop updated (00fa568 -> 7b1fc47)
This is an automated email from the git hooks/post-receive script. New change to branch develop in repository tutti. See http://git.codelutin.com/tutti.git from 00fa568 [jgitflow-maven-plugin]Updating develop poms back to pre merge state new 0ed4097 Ne pas enregistrer la campagne si on met une opération pour un role utilisateur (See #7468) new 0d85de3 Plus besoin de faire du nettoyage sur les roles lors de la sauvegarde d'une campagne (See #7468) new 7b1fc47 La modification d'une valeur dans l'écran campagne efface tous les saisisseurs dans les traits (termine #7468) Merge branch 'feature/7468' into develop The 3 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "adds" were already present in the repository and have only been added to this reference. Detailed log of new commits: commit 7b1fc475bcfb7e88aa15da1c64f4f3aaf5a3946d Merge: 00fa568 0d85de3 Author: Tony CHEMIT <chemit@codelutin.com> Date: Tue Aug 25 16:35:50 2015 +0200 La modification d'une valeur dans l'écran campagne efface tous les saisisseurs dans les traits (termine #7468) Merge branch 'feature/7468' into develop 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) commit 0ed40979869f8ffde787c78954904c358af474a5 Author: Tony CHEMIT <chemit@codelutin.com> Date: Tue Aug 25 16:34:02 2015 +0200 Ne pas enregistrer la campagne si on met une opération pour un role utilisateur (See #7468) Summary of changes: .../service/CruisePersistenceServiceImpl.java | 20 -------------------- .../util/VesselPersonFeaturesPersistenceHelper.java | 1 - 2 files changed, 21 deletions(-) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.
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 0ed40979869f8ffde787c78954904c358af474a5 Author: Tony CHEMIT <chemit@codelutin.com> Date: Tue Aug 25 16:34:02 2015 +0200 Ne pas enregistrer la campagne si on met une opération pour un role utilisateur (See #7468) --- .../persistence/service/util/VesselPersonFeaturesPersistenceHelper.java | 1 - 1 file changed, 1 deletion(-) diff --git a/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/util/VesselPersonFeaturesPersistenceHelper.java b/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/util/VesselPersonFeaturesPersistenceHelper.java index 6e1b2b7..b26bbbf 100644 --- a/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/util/VesselPersonFeaturesPersistenceHelper.java +++ b/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/util/VesselPersonFeaturesPersistenceHelper.java @@ -118,7 +118,6 @@ public class VesselPersonFeaturesPersistenceHelper extends AbstractPersistenceSe vesselPersonFeatures = VesselPersonFeatures.Factory.newInstance(); vesselPersonFeaturesPerPerson.put(personId, vesselPersonFeatures); vesselPersonFeatures.setOperation(fishingOperation); - vesselPersonFeatures.setFishingTrip(fishingOperation.getFishingTrip()); vesselPersonFeatures.setPerson(person); vesselPersonFeatures.setStartDate(fishingOperation.getStartDateTime()); vesselPersonFeatures.setEndDate(fishingOperation.getEndDateTime()); -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.
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>.
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 7b1fc475bcfb7e88aa15da1c64f4f3aaf5a3946d Merge: 00fa568 0d85de3 Author: Tony CHEMIT <chemit@codelutin.com> Date: Tue Aug 25 16:35:50 2015 +0200 La modification d'une valeur dans l'écran campagne efface tous les saisisseurs dans les traits (termine #7468) Merge branch 'feature/7468' into develop .../service/CruisePersistenceServiceImpl.java | 20 -------------------- .../util/VesselPersonFeaturesPersistenceHelper.java | 1 - 2 files changed, 21 deletions(-) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.
participants (1)
-
codelutin.com scm