Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: 0e3e8694 by Tony CHEMIT at 2017-03-29T17:09:26+02:00 [Report 5.x] Correction de la génération des script d'import entre deux bases distantes (see #758) - - - - - 1 changed file: - application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/synchronize/data/DataSynchroUIHandler.java Changes: ===================================== application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/synchronize/data/DataSynchroUIHandler.java ===================================== --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/synchronize/data/DataSynchroUIHandler.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/synchronize/data/DataSynchroUIHandler.java @@ -251,10 +251,8 @@ public class DataSynchroUIHandler extends AdminTabUIHandler<DataSynchroUI> imple private WizardState doExecuteAction0() { ObserveSwingDataSource leftSource = getStepModel().getLeftSource(); - boolean leftSourceIsPG = leftSource.getConfiguration() instanceof ObserveDataSourceConfigurationTopiaPG; ObserveSwingDataSource rightSource = getStepModel().getRightSource(); - boolean rightSourceIsPG = rightSource.getConfiguration() instanceof ObserveDataSourceConfigurationTopiaPG; DefaultListModel<DataSynchronizeTaskSupport> tasks = getStepModel().getTasks(); int size = tasks.size(); @@ -324,7 +322,7 @@ public class DataSynchroUIHandler extends AdminTabUIHandler<DataSynchroUI> imple sendMessage(t("observe.actions.synchro.data.prepare.copyToLeftTask", programStr, tripStr)); - ExportTripRequest exportTripRequest = new ExportTripRequest(rightSourceIsPG, programId, tripId); + ExportTripRequest exportTripRequest = new ExportTripRequest(!leftSource.isLocal(), programId, tripId); ExportTripResult exportTripResult = rightTripManagementService.exportTrip(exportTripRequest); logExportResult(n("observe.actions.synchro.data.result.export.right.trip"), exportTripResult, @@ -349,7 +347,7 @@ public class DataSynchroUIHandler extends AdminTabUIHandler<DataSynchroUI> imple sendMessage(t("observe.actions.synchro.data.prepare.copyToRightTask", programStr, tripStr)); - ExportTripRequest exportTripRequest = new ExportTripRequest(leftSourceIsPG, programId, tripId); + ExportTripRequest exportTripRequest = new ExportTripRequest(!rightSource.isLocal(), programId, tripId); ExportTripResult exportTripResult = leftTripManagementService.exportTrip(exportTripRequest); logExportResult(n("observe.actions.synchro.data.result.export.left.trip"), exportTripResult, View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/0e3e869453de7ece8cc830a0203f...