branch develop updated (09e34f2 -> 3fb324e)
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 09e34f2 add todo new 3fb324e [Actions] Mise à jour du référentiel, le bouton suivant est actif même si la base de référence n'est pas configurée (Fixes #8520) 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 3fb324ed31b80ee39de0d899048cb8ff081e729f Author: Tony CHEMIT <chemit@codelutin.com> Date: Tue Sep 6 15:08:46 2016 +0200 [Actions] Mise à jour du référentiel, le bouton suivant est actif même si la base de référence n'est pas configurée (Fixes #8520) Summary of changes: .../application/swing/ui/admin/AdminUIModel.java | 25 ++++++++++++++++++++++ 1 file changed, 25 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 3fb324ed31b80ee39de0d899048cb8ff081e729f Author: Tony CHEMIT <chemit@codelutin.com> Date: Tue Sep 6 15:08:46 2016 +0200 [Actions] Mise à jour du référentiel, le bouton suivant est actif même si la base de référence n'est pas configurée (Fixes #8520) --- .../application/swing/ui/admin/AdminUIModel.java | 25 ++++++++++++++++++++++ 1 file changed, 25 insertions(+) diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/AdminUIModel.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/AdminUIModel.java index 7e1e3d7..de2c1d4 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/AdminUIModel.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/AdminUIModel.java @@ -1190,6 +1190,31 @@ public class AdminUIModel extends WizardExtModel<AdminStep> { if (containsOperation(AdminStep.SYNCHRONIZE)) { + if (!localSourceModel.isValid()) { + return false; + } + + ObserveDataSourceInformation leftDataSourceInformation = getLocalSourceInformation(); + if (leftDataSourceInformation == null) { + return false; + } + + if (!centralSourceModel.isValid()) { + return false; + } + + ObserveDataSourceInformation rightDataSourceInformation = centralSourceModel.getDataSourceInformation(); + if (rightDataSourceInformation == null) { + return false; + } + + if (!(rightDataSourceInformation.canReadReferential())) { + if (log.isDebugEnabled()) { + log.debug("can not read referential on central source"); + } + return false; + } + // les deux bases (source et referentiel) doivent etre different validate = validateNotSameDataSources(); -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.
participants (1)
-
codelutin.com scm