Tony CHEMIT pushed to branch develop-7.x at ultreiaio / ird-observe Commits: 8439c329 by tchemit at 2020-02-19T16:41:34+01:00 [SYNCHRO AVANCEE] Double connexion à la même base - Closes #1441 - - - - - 9527c1aa by tchemit at 2020-02-19T17:01:11+01:00 fix ci docker jobs - - - - - 3 changed files: - .gitlab-ci.yml - client-core/src/main/java/fr/ird/observe/client/ui/admin/config/ConfigModel.java - client-core/src/main/java/fr/ird/observe/client/ui/admin/synchronize/referential/ng/ReferentialSynchroModel.java Changes: ===================================== .gitlab-ci.yml ===================================== @@ -4,7 +4,7 @@ stages: - Test - Release -image: registry.gitlab.com/${CI_PROJECT_NAMESPACE}/${CI_PROJECT_NAME}/docker:latest +image: registry.gitlab.com/${CI_PROJECT_NAMESPACE}/${CI_PROJECT_NAME}/docker-8:latest .stage_docker: &stage_docker stage: Docker @@ -22,7 +22,7 @@ image: registry.gitlab.com/${CI_PROJECT_NAMESPACE}/${CI_PROJECT_NAME}/docker:lat services: - docker:dind script: - - if [ -n "${CREATE_DOCKER}" ]; then ultreiaio-docker-generate-image gitlab-ci-token $CI_BUILD_TOKEN; fi + - if [ -n "${CREATE_DOCKER}" ]; then ultreiaio-docker-generate-image-8 gitlab-ci-token $CI_BUILD_TOKEN; fi .build-for-release: &build-for-release environment: ===================================== client-core/src/main/java/fr/ird/observe/client/ui/admin/config/ConfigModel.java ===================================== @@ -293,7 +293,10 @@ public class ConfigModel extends AdminActionModel { // les deux bases (source et referentiel) doivent etre different validate = validateNotSameDataSources(); - + if (!validate) { + log.info("Data sources are equals!"); + return false; + } boolean atLeastOneWrite = false; ObserveDataSourceInformation leftDataSourceInformation = getLocalSourceInformation(); @@ -333,17 +336,12 @@ public class ConfigModel extends AdminActionModel { if (validate && uiModel.containsOperation(AdminStep.REFERENTIAL_SYNCHRONIZE)) { - // les deux bases (source et referentiel) doivent etre different - validate = validateNotSameDataSources(); - ObserveDataSourceInformation leftDataSourceInformation = getLocalSourceInformation(); if (leftDataSourceInformation == null) { return false; } if (!(leftDataSourceInformation.canReadReferential())) { - if (log.isDebugEnabled()) { - log.debug("can not read and write referential on left data source"); - } + log.info("can not read and write referential on left data source"); return false; } @@ -353,12 +351,16 @@ public class ConfigModel extends AdminActionModel { } if (!(rightDataSourceInformation.canReadReferential())) { - if (log.isDebugEnabled()) { - log.debug("can not read and write referential on right data source"); - } + log.info("can not read and write referential on right data source"); return false; } + // les deux bases (source et referentiel) doivent etre different + validate = validateNotSameDataSources(); + if (!validate) { + log.info("Data sources are equals!"); + return false; + } ReferentialSynchronizeMode synchronizeMode = uiModel.getReferentialSynchroModel().getSynchronizeMode(); if (synchronizeMode == null) { return false; @@ -407,6 +409,10 @@ public class ConfigModel extends AdminActionModel { // les deux bases (source et referentiel) doivent etre different validate = validateNotSameDataSources(); + if (!validate) { + log.info("Data sources are equals!"); + return false; + } } if (uiModel.containsOperation(AdminStep.EXPORT_DATA)) { ===================================== client-core/src/main/java/fr/ird/observe/client/ui/admin/synchronize/referential/ng/ReferentialSynchroModel.java ===================================== @@ -366,4 +366,6 @@ public class ReferentialSynchroModel extends AdminActionModel { setShowProperties(true); ((ReferentialSynchroUI)ui.getStepUI(AdminStep.REFERENTIAL_SYNCHRONIZE)).getApplyAction().setEnabled(false); } + + } View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/d986e1a1e24001f7e61b1d817... -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/d986e1a1e24001f7e61b1d817... You're receiving this email because of your account on gitlab.com.