Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: 95e86b66 by Tony Chemit at 2021-04-26T14:47:17+02:00 Erreur lorsqu'on refuse la création d'un retour d'expérience - Closes #1833 - - - - - c200daec by Tony Chemit at 2021-04-26T14:48:23+02:00 Détection d'une base de version supérieure - Closes #1831 - - - - - 2 changed files: - client/core/src/main/java/fr/ird/observe/client/action/api/FeedBackBuilder.java - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/wizard/DataSourceHelper.java Changes: ===================================== client/core/src/main/java/fr/ird/observe/client/action/api/FeedBackBuilder.java ===================================== @@ -116,7 +116,8 @@ public class FeedBackBuilder { case JOptionPane.CLOSED_OPTION: case 1: // cancel operation - throw new IllegalStateException("User cancel operation"); + log.warn("User cancel feed back creation."); + return; } File feedBackFile = model.getFeedBackFile(); log.info(String.format("Create feed back at: %s", feedBackFile)); ===================================== client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/wizard/DataSourceHelper.java ===================================== @@ -328,7 +328,8 @@ public class DataSourceHelper { h2Config.getPassword(), h2Config.isShowMigrationProgression(), h2Config.isShowMigrationSql(), - h2Config.getModelVersion() + //tchemit 2021-04-26 always use the application model version, otherwise topia won't do correct migration if required + model.getModelVersion() ); } @@ -343,7 +344,8 @@ public class DataSourceHelper { pgConfig.isUseSsl(), pgConfig.isShowMigrationProgression(), pgConfig.isShowMigrationSql(), - pgConfig.getModelVersion() + //tchemit 2021-04-26 always use the application model version, otherwise topia won't do correct migration if required + model.getModelVersion() ); } @@ -356,7 +358,8 @@ public class DataSourceHelper { restConfig.getLogin(), restConfig.getPassword(), restConfig.getOptionalDatabaseName().orElse(null), - restConfig.getModelVersion() + //tchemit 2021-04-26 always use the application model version, otherwise topia won't do correct migration if required + model.getModelVersion() ); } } View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/627b236393c0536b1f719c4d2... -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/627b236393c0536b1f719c4d2... You're receiving this email because of your account on gitlab.com.