Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe
Commits:
-
8f17bb9c
by Tony Chemit at 2023-12-14T11:16:43+01:00
-
0ece0b67
by Tony Chemit at 2023-12-14T11:44:39+01:00
3 changed files:
- client/datasource/actions/src/main/java/fr/ird/observe/client/datasource/actions/consolidate/ConsolidateModel.java
- client/datasource/actions/src/main/java/fr/ird/observe/client/datasource/actions/report/ReportModel.java
- pom.xml
Changes:
| ... | ... | @@ -88,7 +88,6 @@ public class ConsolidateModel extends AdminActionModel { |
| 88 | 88 | |
| 89 | 89 | setConsolidationFailIfLengthWeightParameterNotFound(getClientConfig().isConsolidationFailIfLengthWeightParameterNotFound());
|
| 90 | 90 | setConsolidationFailIfLengthLengthParameterNotFound(getClientConfig().isConsolidationFailIfLengthLengthParameterNotFound());
|
| 91 | - uiModel.getConsolidateModel().setSkipForReport(getClientConfig().isSkipConsolidateStepForReport());
|
|
| 92 | 91 | }
|
| 93 | 92 | |
| 94 | 93 | @Override
|
| ... | ... | @@ -227,6 +227,7 @@ public class ReportModel extends AdminActionModel { |
| 227 | 227 | };
|
| 228 | 228 | selectDataModel.getSelectionDataModel().addPropertyChangeListener(SelectionTreeModel.SELECTED_COUNT, listenerSelectedDataForReport);
|
| 229 | 229 | updateReports();
|
| 230 | + uiModel.getConsolidateModel().setSkipForReport(getClientConfig().isSkipConsolidateStepForReport());
|
|
| 230 | 231 | }
|
| 231 | 232 | |
| 232 | 233 | @Override
|
| ... | ... | @@ -23,7 +23,7 @@ |
| 23 | 23 | <parent>
|
| 24 | 24 | <groupId>io.ultreia.maven</groupId>
|
| 25 | 25 | <artifactId>pom</artifactId>
|
| 26 | - <version>2023.56</version>
|
|
| 26 | + <version>2023.57</version>
|
|
| 27 | 27 | </parent>
|
| 28 | 28 | <groupId>fr.ird.observe</groupId>
|
| 29 | 29 | <artifactId>ird-observe</artifactId>
|