branch feature/fix_ftl_datasource created (now 1a722be)
This is an automated email from the git hooks/post-receive script. New change to branch feature/fix_ftl_datasource in repository observe. See https://gitlab.nuiton.org/codelutin/observe.git at 1a722be Traduit les chaines de configuration d observe web en espagnol This branch includes the following new commits: new 1a722be Traduit les chaines de configuration d observe web en espagnol 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 1a722be6dd065a768a0cbddbf8bf884cd1209805 Author: Samuel Maisonneuve <maisonneuve@codelutin.com> Date: Thu Sep 1 16:43:21 2016 +0200 Traduit les chaines de configuration d observe web en espagnol fixes #8485 -- 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/fix_ftl_datasource in repository observe. See https://gitlab.nuiton.org/codelutin/observe.git commit 1a722be6dd065a768a0cbddbf8bf884cd1209805 Author: Samuel Maisonneuve <maisonneuve@codelutin.com> Date: Thu Sep 1 16:43:21 2016 +0200 Traduit les chaines de configuration d observe web en espagnol fixes #8485 --- .../ird/observe/application/swing/ui/storage/StorageUIHandler.java | 4 +++- .../fr/ird/observe/application/swing/ui/storage/StorageUIModel.java | 6 +++++- .../application/swing/ui/storage/tabs/StorageTabUIHandler.java | 2 +- .../src/main/resources/ftl/dataSourceConnectionReport_es.ftl | 2 +- .../src/main/resources/ftl/dataSourceConnectionReport_fr.ftl | 2 +- 5 files changed, 11 insertions(+), 5 deletions(-) diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/storage/StorageUIHandler.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/storage/StorageUIHandler.java index 90d5a5e..66661e3 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/storage/StorageUIHandler.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/storage/StorageUIHandler.java @@ -453,7 +453,9 @@ public class StorageUIHandler { } // suppression du storage local - if (localDataSource != null && localDataSource != currentDataSource) { + if (localDataSource != null + && localDataSource.isOpen() // Si la base a été détruite précédemment, elle n'est plus ouverte + && localDataSource != currentDataSource) { // ce cas peut arriver lorsque l'on fait juste une backup // sans vouloir supprimer la base locale if (log.isDebugEnabled()) { diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/storage/StorageUIModel.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/storage/StorageUIModel.java index 8bd9c4b..f10b1b8 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/storage/StorageUIModel.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/storage/StorageUIModel.java @@ -222,7 +222,7 @@ public class StorageUIModel extends WizardModel<StorageStep> { /** Les information de connextion a la base **/ protected ObserveDataSourceInformation h2DataSourceInformation; - /** le fichier d'import des donné */ + /** le fichier d'import des données */ protected File dumpFile; /** le mode de creation d'une base */ @@ -1159,6 +1159,10 @@ public class StorageUIModel extends WizardModel<StorageStep> { return ObserveSwingApplicationContext.get().getConfig().getModelVersion(); } + public File getInitialDbDump() { + return ObserveSwingApplicationContext.get().getConfig().getInitialDbDump(); + } + public DbMode getDbMode() { return dbMode; } diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/storage/tabs/StorageTabUIHandler.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/storage/tabs/StorageTabUIHandler.java index cd5b000..2c28170 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/storage/tabs/StorageTabUIHandler.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/storage/tabs/StorageTabUIHandler.java @@ -384,7 +384,7 @@ public class StorageTabUIHandler { } else { text = t("observe.storage.internalDump.not.exist"); } - return t(CreationMode.IMPORT_INTERNAL_DUMP.getLabel()) + text; + return t(CreationMode.IMPORT_INTERNAL_DUMP.getLabel()) + " " + text; } protected String updateCanMigrateLabel(ChooseDbModeUI ui, diff --git a/application-swing/src/main/resources/ftl/dataSourceConnectionReport_es.ftl b/application-swing/src/main/resources/ftl/dataSourceConnectionReport_es.ftl index f8258a0..16a6920 100644 --- a/application-swing/src/main/resources/ftl/dataSourceConnectionReport_es.ftl +++ b/application-swing/src/main/resources/ftl/dataSourceConnectionReport_es.ftl @@ -141,7 +141,7 @@ <h3>Importación con el último referencial cargado :</h3> <ul> - <li>${config.initialDbDump.absoluteFile.absolutePath}</li> + <li>${initialDbDump.absolutePath}</li> </ul> <#elseif creationMode.name() == "IMPORT_EXTERNAL_DUMP"> diff --git a/application-swing/src/main/resources/ftl/dataSourceConnectionReport_fr.ftl b/application-swing/src/main/resources/ftl/dataSourceConnectionReport_fr.ftl index f2bfae8..99c8902 100644 --- a/application-swing/src/main/resources/ftl/dataSourceConnectionReport_fr.ftl +++ b/application-swing/src/main/resources/ftl/dataSourceConnectionReport_fr.ftl @@ -141,7 +141,7 @@ <h3>Import depuis une le dernier référentiel téléchargé :</h3> <ul> - <li>${config.initialDbDump.absoluteFile.absolutePath}</li> + <li>${initialDbDump.absolutePath}</li> </ul> <#elseif creationMode.name() == "IMPORT_EXTERNAL_DUMP"> -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.
participants (1)
-
codelutin.com scm