Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: 8f17bb9c by Tony Chemit at 2023-12-14T11:16:43+01:00 Add client configuration option skipConsolidateStepForReport - Closes #281x ? - - - - - 0ece0b67 by Tony Chemit at 2023-12-14T11:44:39+01:00 update pom - - - - - 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: ===================================== client/datasource/actions/src/main/java/fr/ird/observe/client/datasource/actions/consolidate/ConsolidateModel.java ===================================== @@ -88,7 +88,6 @@ public class ConsolidateModel extends AdminActionModel { setConsolidationFailIfLengthWeightParameterNotFound(getClientConfig().isConsolidationFailIfLengthWeightParameterNotFound()); setConsolidationFailIfLengthLengthParameterNotFound(getClientConfig().isConsolidationFailIfLengthLengthParameterNotFound()); - uiModel.getConsolidateModel().setSkipForReport(getClientConfig().isSkipConsolidateStepForReport()); } @Override ===================================== client/datasource/actions/src/main/java/fr/ird/observe/client/datasource/actions/report/ReportModel.java ===================================== @@ -227,6 +227,7 @@ public class ReportModel extends AdminActionModel { }; selectDataModel.getSelectionDataModel().addPropertyChangeListener(SelectionTreeModel.SELECTED_COUNT, listenerSelectedDataForReport); updateReports(); + uiModel.getConsolidateModel().setSkipForReport(getClientConfig().isSkipConsolidateStepForReport()); } @Override ===================================== pom.xml ===================================== @@ -23,7 +23,7 @@ <parent> <groupId>io.ultreia.maven</groupId> <artifactId>pom</artifactId> - <version>2023.56</version> + <version>2023.57</version> </parent> <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/a2d4e73710d94ef8e357b9ab6... -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/a2d4e73710d94ef8e357b9ab6... You're receiving this email because of your account on gitlab.com.