branch develop-5.x updated (1b8486e -> 3d87074)
This is an automated email from the git hooks/post-receive script. New change to branch develop-5.x in repository observe. See https://gitlab.nuiton.org/codelutin/observe.git from 1b8486e Ne pas afficher l'onglet Avancon lors de la création d'une capture (See #8859) new 7ebce1a Changement libellé Configuration de la base de référence sur écran Exporter les données (Refs #8454) new 3d87074 Changement libellé Configuration de la base de référence sur écran Exporter les données (Refs #8454) (fix cherry-pick) The 2 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 3d870742b02d0b196058df777eaf716e2e778698 Author: Tony CHEMIT <chemit@codelutin.com> Date: Sun Dec 18 13:02:09 2016 +0100 Changement libellé Configuration de la base de référence sur écran Exporter les données (Refs #8454) (fix cherry-pick) commit 7ebce1a8387e9089bb5a2715f352ac6f860fad72 Author: Tony CHEMIT <chemit@codelutin.com> Date: Sun Dec 18 12:58:42 2016 +0100 Changement libellé Configuration de la base de référence sur écran Exporter les données (Refs #8454) Summary of changes: .../observe/application/swing/ui/admin/AdminUIHandler.java | 12 ++++++++++++ .../main/resources/i18n/application-swing_en_GB.properties | 1 + .../main/resources/i18n/application-swing_es_ES.properties | 1 + .../main/resources/i18n/application-swing_fr_FR.properties | 1 + 4 files changed, 15 insertions(+) -- 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 develop-5.x in repository observe. See https://gitlab.nuiton.org/codelutin/observe.git commit 7ebce1a8387e9089bb5a2715f352ac6f860fad72 Author: Tony CHEMIT <chemit@codelutin.com> Date: Sun Dec 18 12:58:42 2016 +0100 Changement libellé Configuration de la base de référence sur écran Exporter les données (Refs #8454) --- .../observe/application/swing/ui/admin/AdminUIHandler.java | 12 ++++++++++++ .../main/resources/i18n/application-swing_en_GB.properties | 1 + .../main/resources/i18n/application-swing_es_ES.properties | 1 + .../main/resources/i18n/application-swing_fr_FR.properties | 1 + 4 files changed, 15 insertions(+) diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/AdminUIHandler.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/AdminUIHandler.java index c98ee1b..4fb3dd9 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/AdminUIHandler.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/AdminUIHandler.java @@ -194,6 +194,18 @@ public class AdminUIHandler { } + if (oldStep == null + && newStep == AdminStep.CONFIG + && model.containsOperation(AdminStep.EXPORT_DATA)) { + + ConfigUI configUI = (ConfigUI) ui.getStepUI(AdminStep.CONFIG); + + model.getConfigModel().setCentralSourceLabel(t("observe.storage.config.target.storage")); + + configUI.getCentralSourceConfig().setBorder(new TitledBorder(model.getConfigModel().getCentralSourceLabel())); + + } + if (c != null && c.getStep() == AdminStep.SAVE_LOCAL) { // on met a jour le descriptif diff --git a/application-swing/src/main/resources/i18n/application-swing_en_GB.properties b/application-swing/src/main/resources/i18n/application-swing_en_GB.properties index 7fc4542..7f5c463 100644 --- a/application-swing/src/main/resources/i18n/application-swing_en_GB.properties +++ b/application-swing/src/main/resources/i18n/application-swing_en_GB.properties @@ -1557,6 +1557,7 @@ observe.storage.config.referentiel.mode=Referential import mode observe.storage.config.referentiel.storage=Central data source configuration observe.storage.config.right.storage=Right data source configuration observe.storage.config.source.storage=Data source configuration +observe.storage.config.target.storage=Configuration of target data source observe.storage.error.badUrl=The url format is not valid (%s) observe.storage.error.dbVersionMismatch=Version of remote database (%s) is not compiliant with the model version (%s) observe.storage.error.rest.database.unknownForUser=Database "%s" is not defined for user "%s" diff --git a/application-swing/src/main/resources/i18n/application-swing_es_ES.properties b/application-swing/src/main/resources/i18n/application-swing_es_ES.properties index b352c92..6aba201 100644 --- a/application-swing/src/main/resources/i18n/application-swing_es_ES.properties +++ b/application-swing/src/main/resources/i18n/application-swing_es_ES.properties @@ -1557,6 +1557,7 @@ observe.storage.config.referentiel.mode=Modo de importación del referencial observe.storage.config.referentiel.storage=Configuración de la base de referencia observe.storage.config.right.storage=Configuration de la base de la derecha observe.storage.config.source.storage=Configuración de la base origen +observe.storage.config.target.storage=Configuration de la base destination \#TODO observe.storage.error.badUrl=Error en el formato de la dirección (URL) %s observe.storage.error.dbVersionMismatch=La versión de la base remota (%s) no es compatible con la versión del modelo (%s). observe.storage.error.rest.database.unknownForUser=La base de datos "%s" no está configurada para el usuario "%s" diff --git a/application-swing/src/main/resources/i18n/application-swing_fr_FR.properties b/application-swing/src/main/resources/i18n/application-swing_fr_FR.properties index 67a7e72..fb51c3e 100644 --- a/application-swing/src/main/resources/i18n/application-swing_fr_FR.properties +++ b/application-swing/src/main/resources/i18n/application-swing_fr_FR.properties @@ -1557,6 +1557,7 @@ observe.storage.config.referentiel.mode=Mode d'import du référentiel observe.storage.config.referentiel.storage=Configuration de la base de référence observe.storage.config.right.storage=Configuration de la base de droite observe.storage.config.source.storage=Configuration de la base source +observe.storage.config.target.storage=Configuration de la base destination observe.storage.error.badUrl=Erreur dans le format de l'URL %s observe.storage.error.dbVersionMismatch=La version de la base distante (%s) n'est pas compatible avec la version du modèle (%s) observe.storage.error.rest.database.unknownForUser=La base de données "%s" n'est pas définie pour l'utilisateur "%s" -- 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 develop-5.x in repository observe. See https://gitlab.nuiton.org/codelutin/observe.git commit 3d870742b02d0b196058df777eaf716e2e778698 Author: Tony CHEMIT <chemit@codelutin.com> Date: Sun Dec 18 13:02:09 2016 +0100 Changement libellé Configuration de la base de référence sur écran Exporter les données (Refs #8454) (fix cherry-pick) --- .../fr/ird/observe/application/swing/ui/admin/AdminUIHandler.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/AdminUIHandler.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/AdminUIHandler.java index 4fb3dd9..f6c80f0 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/AdminUIHandler.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/AdminUIHandler.java @@ -200,9 +200,9 @@ public class AdminUIHandler { ConfigUI configUI = (ConfigUI) ui.getStepUI(AdminStep.CONFIG); - model.getConfigModel().setCentralSourceLabel(t("observe.storage.config.target.storage")); + model.setCentralSourceLabel(t("observe.storage.config.target.storage")); - configUI.getCentralSourceConfig().setBorder(new TitledBorder(model.getConfigModel().getCentralSourceLabel())); + configUI.getCentralSourceConfig().setBorder(new TitledBorder(model.getCentralSourceLabel())); } -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.
participants (1)
-
codelutin.com scm