Tony CHEMIT pushed to branch develop-7.x at ultreiaio / ird-observe Commits: 7b2ec932 by Tony Chemit at 2022-07-29T14:13:03+02:00 Erreur dans l'identification des bases de droite et gauche dans la synchro avancée - Closes #2392 - - - - - 2 changed files: - client-core/src/main/java/fr/ird/observe/client/ui/admin/synchronize/referential/ng/tree/node/ReferentialPropertyUpdatedNode.java - services/src/main/java/fr/ird/observe/services/service/referential/differential/DifferentialModel.java Changes: ===================================== client-core/src/main/java/fr/ird/observe/client/ui/admin/synchronize/referential/ng/tree/node/ReferentialPropertyUpdatedNode.java ===================================== @@ -44,8 +44,8 @@ public class ReferentialPropertyUpdatedNode extends SynchroNodeSupport { this.propertyName = property.getPropertyName(); this.property = property; - String leftValue = left ? property.getOldValueLabel(decoratorService) : property.getNewValueLabel(decoratorService); - String rightValue = left ? property.getNewValueLabel(decoratorService) : property.getOldValueLabel(decoratorService); + String leftValue = left ? property.getNewValueLabel(decoratorService) : property.getOldValueLabel(decoratorService); + String rightValue = left ? property.getOldValueLabel(decoratorService) : property.getNewValueLabel(decoratorService); this.label = property.getPropertyNameLabel(dtoType, decoratorService); this.modificationLabel = String.format("<i>( %s )</i>", t("observe.actions.synchro.referential.property.modified", leftValue, rightValue)); // by default all properties are selected ===================================== services/src/main/java/fr/ird/observe/services/service/referential/differential/DifferentialModel.java ===================================== @@ -216,17 +216,17 @@ public class DifferentialModel { return this; } - protected <D extends ReferentialDto> void addToLeft(DifferentialType stateType, D leftDto, D rightDto, ImmutableSet<String> modifiedProperties) { - add0(true, stateType, leftDto, rightDto, leftSideBuilder, modifiedProperties); + protected <D extends ReferentialDto> void addToLeft(DifferentialType stateType, D thisSideDto, D otherSideDto, ImmutableSet<String> modifiedProperties) { + add0(logPrefix(true), stateType, thisSideDto, otherSideDto, leftSideBuilder, modifiedProperties); } - protected <D extends ReferentialDto> void addToRight(DifferentialType stateType, D leftDto, D rightDto, ImmutableSet<String> modifiedProperties) { - add0(false, stateType, leftDto, rightDto, rightSideBuilder, modifiedProperties); + protected <D extends ReferentialDto> void addToRight(DifferentialType stateType, D thisSideDto, D otherSideDto, ImmutableSet<String> modifiedProperties) { + add0(logPrefix(false), stateType, thisSideDto, otherSideDto, rightSideBuilder, modifiedProperties); } - protected <D extends ReferentialDto> void add0(boolean left, DifferentialType stateType, D leftDto, D rightDto, List<Differential> builder, ImmutableSet<String> modifiedProperties) { - Differential state = new Differential(stateType, leftDto, rightDto, modifiedProperties); - log.info(String.format("%s → %s - add %s", leftDto.getClass().getName(), logPrefix(left), state)); + protected <D extends ReferentialDto> void add0(String logPrefix, DifferentialType stateType, D thisSideDto, D otherSideDto, List<Differential> builder, ImmutableSet<String> modifiedProperties) { + Differential state = new Differential(stateType, thisSideDto, otherSideDto, modifiedProperties); + log.info(String.format("%s → %s - add %s", thisSideDto.getClass().getName(), logPrefix, state)); builder.add(state); } View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/commit/7b2ec932076171d53fe64e8526... -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/commit/7b2ec932076171d53fe64e8526... You're receiving this email because of your account on gitlab.com.