| ... |
... |
@@ -118,7 +118,8 @@ public class StorageBackupUILauncher extends StorageUILauncher { |
|
118
|
118
|
|
|
119
|
119
|
SelectionTreeModel dataModel = storageModel.getSelectDataModel();
|
|
120
|
120
|
int stepsCount = 1;
|
|
121
|
|
- if (!dataModel.isDataFull()) {
|
|
|
121
|
+ boolean needCopyDataToTemporaryDatasource = !dataModel.isDataFull() || !localSource.isLocal();
|
|
|
122
|
+ if (needCopyDataToTemporaryDatasource) {
|
|
122
|
123
|
Map<ProgramReference, List<DataDtoReference<?, ?>>> tripsByProgram = dataModel.getSelectedDataByProgram();
|
|
123
|
124
|
for (List<DataDtoReference<?, ?>> programDtoReferentialReference : tripsByProgram.values()) {
|
|
124
|
125
|
stepsCount += 2 * programDtoReferentialReference.size();
|
| ... |
... |
@@ -128,7 +129,7 @@ public class StorageBackupUILauncher extends StorageUILauncher { |
|
128
|
129
|
progressModel.setStepsCount(stepsCount + 1);
|
|
129
|
130
|
|
|
130
|
131
|
try {
|
|
131
|
|
- if (!dataModel.isDataFull()) {
|
|
|
132
|
+ if (needCopyDataToTemporaryDatasource) {
|
|
132
|
133
|
|
|
133
|
134
|
// on renseigne les marees a exporter uniquement si
|
|
134
|
135
|
// on en a selectionner, de plus si on a selectionne
|
| ... |
... |
@@ -153,7 +154,7 @@ public class StorageBackupUILauncher extends StorageUILauncher { |
|
153
|
154
|
|
|
154
|
155
|
for (Map.Entry<ProgramReference, List<DataDtoReference<?, ?>>> entry : tripsByProgram.entrySet()) {
|
|
155
|
156
|
|
|
156
|
|
- for (DataDtoReference trip : entry.getValue()) {
|
|
|
157
|
+ for (DataDtoReference<?, ?> trip : entry.getValue()) {
|
|
157
|
158
|
|
|
158
|
159
|
ExportTripRequest exportRequest = new ExportTripRequest(false, entry.getKey().getId(), trip.getId());
|
|
159
|
160
|
ExportTripResult exportTripResult = managementService.exportTrip(exportRequest);
|