branch develop updated (b066823 -> cd063c5)
This is an automated email from the git hooks/post-receive script. New change to branch develop in repository observe. See https://gitlab.nuiton.org/codelutin/observe.git from b066823 Assistant de connexion (Fixes #8555) Merge branch 'feature/8555' into develop new cd063c5 Changement libellé Configuration de la base de référence sur écran Exporter les données (Refs #8454) 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 cd063c5d972a8efe2481cc76b723ce854ef3d7f5 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 in repository observe. See https://gitlab.nuiton.org/codelutin/observe.git commit cd063c5d972a8efe2481cc76b723ce854ef3d7f5 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 98409c8..fbdc37f 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 @@ -213,6 +213,18 @@ public class AdminUIHandler implements UIHandler<AdminUI> { } + 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 6c175be..150da67 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 @@ -1598,6 +1598,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 d25293f..8b266c6 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 @@ -1598,6 +1598,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 c2a561a..4e8fff6 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 @@ -1598,6 +1598,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>.
participants (1)
-
codelutin.com scm