Tony CHEMIT pushed to branch develop-7.x at ultreiaio / ird-observe Commits: 9b294447 by Tony CHEMIT at 2018-09-18T09:10:37Z En mode serveur, la boîte d'information sur la connexion n'indique pas la BD (alias) à laquelle on est connecté - Closes #1057 - - - - - e5843b1b by Tony CHEMIT at 2018-09-18T09:10:37Z use last pom - - - - - 4 changed files: - client/src/main/ftl/dataSourceInformation_en.ftl - client/src/main/ftl/dataSourceInformation_es.ftl - client/src/main/ftl/dataSourceInformation_fr.ftl - pom.xml Changes: ===================================== client/src/main/ftl/dataSourceInformation_en.ftl ===================================== @@ -15,7 +15,7 @@ <#else> <li><strong>Web service url: </strong>${configuration.serverUrl}</li> <li><strong>User: </strong>${configuration.login}</li> - <#if configuration.optionalDatabaseName.present> + <#if configuration.optionalDatabaseName.present??> <li><strong>Database alias: </strong>${configuration.optionalDatabaseName.get()}</li> </#if> </#if> ===================================== client/src/main/ftl/dataSourceInformation_es.ftl ===================================== @@ -15,7 +15,7 @@ <#else> <li><strong>URL del servicio web: </strong>${configuration.serverUrl}</li> <li><strong>Usuario: </strong>${configuration.login}</li> - <#if configuration.optionalDatabaseName.present> + <#if configuration.optionalDatabaseName.present??> <li><strong>Alias de la base: </strong>${configuration.optionalDatabaseName.get()}</li> </#if> </#if> ===================================== client/src/main/ftl/dataSourceInformation_fr.ftl ===================================== @@ -15,7 +15,7 @@ <#else> <li><strong>URL du service web : </strong>${configuration.serverUrl}</li> <li><strong>Utilisateur : </strong>${configuration.login}</li> - <#if configuration.optionalDatabaseName.present> + <#if configuration.optionalDatabaseName.present??> <li><strong>Alias de la base : </strong>${configuration.optionalDatabaseName.get()}</li> </#if> </#if> ===================================== pom.xml ===================================== @@ -26,7 +26,7 @@ <parent> <groupId>io.ultreia.maven</groupId> <artifactId>pom</artifactId> - <version>2018.53</version> + <version>2018.56</version> </parent> <groupId>fr.ird.observe</groupId> @@ -153,7 +153,7 @@ <buildDate>${maven.build.timestamp}</buildDate> <observeToolkitVersion>3.7.7</observeToolkitVersion> - <lib.version.java4all.http>1.0.13</lib.version.java4all.http> + <!--<lib.version.java4all.http>1.0.13</lib.version.java4all.http>--> <lib.version.nuiton.validation>3.1</lib.version.nuiton.validation> <!--<lib.version.java4all.config>1.0.3</lib.version.java4all.config>--> <xworkVersion>2.3.35</xworkVersion> View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/compare/1fe7c6c424f908cfb04539163d3... -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/compare/1fe7c6c424f908cfb04539163d3... You're receiving this email because of your account on gitlab.com.