branch develop updated (00717c6 -> d448e55)
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 00717c6 [GESTION AVANCEE REFERENTIEL] 2 boutons semblent avoir la même fonction (Fixes #8581) new d448e55 [GESTION AVANCEE REFERENTIEL] Comportement de l'UI gestion avancée du référentiel suite à migration de bases (Fixes #8580) 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 d448e55d04b1558c06074f591d589c438281e1a0 Author: Tony CHEMIT <chemit@codelutin.com> Date: Tue Oct 4 10:02:58 2016 +0200 [GESTION AVANCEE REFERENTIEL] Comportement de l'UI gestion avancée du référentiel suite à migration de bases (Fixes #8580) Summary of changes: .../synchro/referential/diff/ReferentialSynchronizeDiffState.java | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) -- 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 d448e55d04b1558c06074f591d589c438281e1a0 Author: Tony CHEMIT <chemit@codelutin.com> Date: Tue Oct 4 10:02:58 2016 +0200 [GESTION AVANCEE REFERENTIEL] Comportement de l'UI gestion avancée du référentiel suite à migration de bases (Fixes #8580) --- .../synchro/referential/diff/ReferentialSynchronizeDiffState.java | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/services/src/main/java/fr/ird/observe/services/service/actions/synchro/referential/diff/ReferentialSynchronizeDiffState.java b/services/src/main/java/fr/ird/observe/services/service/actions/synchro/referential/diff/ReferentialSynchronizeDiffState.java index afa0fae..a4fe755 100644 --- a/services/src/main/java/fr/ird/observe/services/service/actions/synchro/referential/diff/ReferentialSynchronizeDiffState.java +++ b/services/src/main/java/fr/ird/observe/services/service/actions/synchro/referential/diff/ReferentialSynchronizeDiffState.java @@ -81,9 +81,13 @@ public class ReferentialSynchronizeDiffState implements Comparable<ReferentialSy @Override public int compareTo(ReferentialSynchronizeDiffState o) { - if (Objects.equals(lastUpdateDate.getTime(), o.lastUpdateDate.getTime()) && Objects.equals(version, o.getVersion())) { + // On ne peut pas se base sur le lastUpdateDate car il est initialisé lors d'une migration (4.901) + // et donc si deux bases sont migrées avant une 4.901 avec un référentiel identique, on se retrouve + // avec les dernier migré qui a tous ses référentiels en avance sur l'autre... + // On reste donc sur la comparaison avec le topiaVersion + if (/*Objects.equals(lastUpdateDate.getTime(), o.lastUpdateDate.getTime()) &&*/ Objects.equals(version, o.getVersion())) { return EQUALS; } - return lastUpdateDate.before(o.getLastUpdateDate()) || version < o.getVersion() ? BEFORE : AFTER; + return /*lastUpdateDate.before(o.getLastUpdateDate()) ||*/ version < o.getVersion() ? BEFORE : AFTER; } } -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.
participants (1)
-
codelutin.com scm