branch develop updated (7de7265 -> 60bce99)
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 7de7265 Normalisation de démarrage des synchro new 76693a3 suppression code de test new 60bce99 réajout de l'opération de synchronisation de référentiel avant export 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 60bce99242b81fe4831dcc0372bb5bd9c5d93e05 Author: Tony CHEMIT <chemit@codelutin.com> Date: Mon Aug 22 09:56:07 2016 +0200 réajout de l'opération de synchronisation de référentiel avant export commit 76693a31066f4abfc5c5e0b1cd95d0620dfad22e Author: Tony CHEMIT <chemit@codelutin.com> Date: Mon Aug 22 09:55:25 2016 +0200 suppression code de test Summary of changes: .../src/main/java/fr/ird/observe/ui/admin/AdminUIModel.java | 10 +++------- 1 file changed, 3 insertions(+), 7 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 76693a31066f4abfc5c5e0b1cd95d0620dfad22e Author: Tony CHEMIT <chemit@codelutin.com> Date: Mon Aug 22 09:55:25 2016 +0200 suppression code de test --- .../src/main/java/fr/ird/observe/ui/admin/AdminUIModel.java | 3 --- 1 file changed, 3 deletions(-) diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/admin/AdminUIModel.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/admin/AdminUIModel.java index a46d20c..31851ea 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/admin/AdminUIModel.java +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/admin/AdminUIModel.java @@ -635,9 +635,6 @@ public class AdminUIModel extends WizardExtModel<AdminStep> { } if (containsOperation(AdminStep.REFERENTIAL_SYNCHRONIZE)) { - //FIXME Remove this after tests - getCentralSourceModel().setRemotePassword('a'); - getReferentialSynchroModel().removePropertyChangeListener(listenReferentialConfigChanged); getReferentialSynchroModel().addPropertyChangeListener(listenReferentialConfigChanged); -- 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 60bce99242b81fe4831dcc0372bb5bd9c5d93e05 Author: Tony CHEMIT <chemit@codelutin.com> Date: Mon Aug 22 09:56:07 2016 +0200 réajout de l'opération de synchronisation de référentiel avant export --- .../src/main/java/fr/ird/observe/ui/admin/AdminUIModel.java | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/admin/AdminUIModel.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/admin/AdminUIModel.java index 31851ea..96a70f6 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/admin/AdminUIModel.java +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/admin/AdminUIModel.java @@ -969,16 +969,15 @@ public class AdminUIModel extends WizardExtModel<AdminStep> { // pour exporter les données utilisateurs // l'opération de synchronisation de référentiel est nécessaire - // FIXME Sbavencoff 30/03/20156 desactivation temproraire de la synchro du référentiel */ - //getOperations().add(AdminStep.SYNCHRONIZE); + getOperations().add(AdminStep.SYNCHRONIZE); - // l'objectOperation de calcul des données est aussi obligatoire + // l'opération de calcul des données est aussi obligatoire getOperations().add(AdminStep.CONSOLIDATE); } if (AdminStep.REPORT == step) { - // l'objectOperation de calcul des données est obligatoire + // l'opération de calcul des données est obligatoire getOperations().add(AdminStep.CONSOLIDATE); } return (AdminUIModel) super.addOperation(step); -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.
participants (1)
-
codelutin.com scm