branch feature/8124-verifAction created (now a5cb3ab)
This is an automated email from the git hooks/post-receive script. New change to branch feature/8124-verifAction in repository tutti. See https://gitlab.nuiton.org/codelutin/tutti.git at a5cb3ab on initialise les configuration avec les valeurs par défaut (see #8124). This branch includes the following new commits: new a5cb3ab on initialise les configuration avec les valeurs par défaut (see #8124). The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "adds" were already present in the repository and have only been added to this reference. Detailed log of new commits: commit a5cb3aba5af9e1e7633a8cac80511c919500ef96 Author: Sylvain Bavencoff <bavencoff@codelutin.com> Date: Wed Mar 30 14:28:38 2016 +0200 on initialise les configuration avec les valeurs par défaut (see #8124). -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.
This is an automated email from the git hooks/post-receive script. New commit to branch feature/8124-verifAction in repository tutti. See https://gitlab.nuiton.org/codelutin/tutti.git commit a5cb3aba5af9e1e7633a8cac80511c919500ef96 Author: Sylvain Bavencoff <bavencoff@codelutin.com> Date: Wed Mar 30 14:28:38 2016 +0200 on initialise les configuration avec les valeurs par défaut (see #8124). --- .../src/main/java/fr/ird/observe/ui/storage/StorageUIModel.java | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) 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 d9b07b3..391b4a0 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 @@ -388,7 +388,7 @@ public class StorageUIModel extends WizardModel<StorageStep> { CreationMode mode = config.getDefaultCreationMode(); - // on initialise les configuration avec les valeurs par defaul + // on initialise les configuration avec les valeurs par défaut h2Config = config.getDataSourceConfigurationH2(t("observe.storage.label.local")); pgConfig = config.getDataSourceConfigurationPG(t("observe.storage.label.remote")); restConfig = config.getDataSourceConfigurationRest(t("observe.storage.label.server")); @@ -503,6 +503,11 @@ public class StorageUIModel extends WizardModel<StorageStep> { log.debug("canMigrate ? " + isCanMigrate()); } + // on initialise les configuration avec les valeurs par défaut + h2Config = config.getDataSourceConfigurationH2(t("observe.storage.label.local")); + pgConfig = config.getDataSourceConfigurationPG(t("observe.storage.label.remote")); + restConfig = config.getDataSourceConfigurationRest(t("observe.storage.label.server")); + if (previousConfig instanceof ObserveDataSourceConfigurationTopiaH2) { // on est actuellement connecte sur une base locale -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.
participants (1)
-
codelutin.com scm