This is an automated email from the git hooks/post-receive script. New commit to branch feature/8124-VerifConfigurationSource in repository tutti. See https://gitlab.nuiton.org/codelutin/tutti.git commit 6b65ebdd53468abae8ddec8c0c4b4daa434662af Author: Sylvain Bavencoff <bavencoff@codelutin.com> Date: Wed Mar 16 10:05:18 2016 +0100 correction du canMigrate pour le test des connexion (see #8124). --- .../src/main/java/fr/ird/observe/ui/storage/StorageUIModel.java | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/storage/StorageUIModel.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/storage/StorageUIModel.java index db85de9..3b416c4 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/storage/StorageUIModel.java +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/storage/StorageUIModel.java @@ -1132,9 +1132,12 @@ public class StorageUIModel extends WizardModel<StorageStep> { if (dbMode != null) { switch (dbMode) { case USE_LOCAL: - case CREATE_LOCAL: result = true; break; + case CREATE_LOCAL: + // en cration de base local on autorise les migration uniquement pour les imports de dump + result = CreationMode.IMPORT_EXTERNAL_DUMP.equals(creationMode) || CreationMode.IMPORT_INTERNAL_DUMP.equals(creationMode); + break; case USE_REMOTE: case USE_SERVER: result = ObstunaAdminAction.UPDATE.equals(adminAction); @@ -1761,7 +1764,7 @@ public class StorageUIModel extends WizardModel<StorageStep> { Version versionDataSource = dataSourceInformation.getVersion(); // en mise a jour de la base on ne test pas la version - if (getModelVersion().equals(versionDataSource) || isCanMigrate() || ObstunaAdminAction.CREATE.equals(adminAction)) { + if (getModelVersion().equals(versionDataSource) || isCanMigrate() || ObstunaAdminAction.CREATE.equals(adminAction)) { setConnexionStatus(ConnexionStatus.SUCCESS); -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.