branch feature/8124-VerifAdmin created (now 1869760)
This is an automated email from the git hooks/post-receive script. New change to branch feature/8124-VerifAdmin in repository tutti. See https://gitlab.nuiton.org/codelutin/tutti.git at 1869760 correction d'une traductions. This branch includes the following new commits: new f4655ed enregistré la configuration du serveur (see #8124). new 1869760 correction d'une traductions. 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 18697601a098eebe590372987afc1dda8d70c39f Author: Sylvain Bavencoff <bavencoff@codelutin.com> Date: Wed Mar 23 13:23:13 2016 +0100 correction d'une traductions. commit f4655ede1df22c6f1323469edfec045f38782012 Author: Sylvain Bavencoff <bavencoff@codelutin.com> Date: Wed Mar 23 12:42:12 2016 +0100 enregistré la configuration du serveur (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-VerifAdmin in repository tutti. See https://gitlab.nuiton.org/codelutin/tutti.git commit f4655ede1df22c6f1323469edfec045f38782012 Author: Sylvain Bavencoff <bavencoff@codelutin.com> Date: Wed Mar 23 12:42:12 2016 +0100 enregistré la configuration du serveur (see #8124). --- .../java/fr/ird/observe/ui/storage/StorageUIHandler.java | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/storage/StorageUIHandler.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/storage/StorageUIHandler.java index e2548ef..d55e847 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/storage/StorageUIHandler.java +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/storage/StorageUIHandler.java @@ -582,8 +582,17 @@ public class StorageUIHandler { // on sauvegarde dans le parametrage dans la configuration de // l'application - ObserveDataSourceConfigurationTopiaPG configurationTopiaPG = model.toPGStorageConfig(""); - config.fromStorageConfig(configurationTopiaPG); + if (model.isEditRemoteConfig()) { + + ObserveDataSourceConfigurationTopiaPG configurationTopiaPG = model.toPGStorageConfig(""); + config.fromStorageConfig(configurationTopiaPG); + + } else if (model.isEditServerConfig()) { + + ObserveDataSourceConfigurationRest configurationRest = model.toRestStorageConfig(""); + config.fromStorageConfig(configurationRest); + + } } /** -- 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-VerifAdmin in repository tutti. See https://gitlab.nuiton.org/codelutin/tutti.git commit 18697601a098eebe590372987afc1dda8d70c39f Author: Sylvain Bavencoff <bavencoff@codelutin.com> Date: Wed Mar 23 13:23:13 2016 +0100 correction d'une traductions. --- .../src/main/resources/i18n/observe-application-swing_fr_FR.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/observe-application-swing/src/main/resources/i18n/observe-application-swing_fr_FR.properties b/observe-application-swing/src/main/resources/i18n/observe-application-swing_fr_FR.properties index ccb8c61..e845ca4 100644 --- a/observe-application-swing/src/main/resources/i18n/observe-application-swing_fr_FR.properties +++ b/observe-application-swing/src/main/resources/i18n/observe-application-swing_fr_FR.properties @@ -1942,7 +1942,7 @@ observe.storage.selected.dbMode=Type de source de données sélectionné observe.storage.selectedCreationMode=Mode de création sélectionné observe.storage.server.dataBase=Base de données observe.storage.server.db=(serveur distant) -observe.storage.server.sessionExpire=La connexion avec le serveur n'est plus active. Que voulez-faire ?\n\n\t - Fermer la connexion avec le serveur, \n\t - Changer de source de données, \n\t - Se re-conncter au serveur.\n\n ATTENTION : Les modifications en cours seront perdu ! +observe.storage.server.sessionExpire=La connexion avec le serveur n'est plus active. Que voulez-faire ?\n\n\t - Fermer la connexion avec le serveur, \n\t - Changer de source de données, \n\t - Se re-conncter au serveur.\n\n ATTENTION \: Les modifications en cours seront perdu \! observe.storage.server.sessionExpire.change=Changer observe.storage.server.sessionExpire.close=Fermer observe.storage.server.sessionExpire.reload=Re-connecter -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.
participants (1)
-
codelutin.com scm