branch develop updated (9993341 -> 7df5e6a)
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 9993341 Champs non binde :( new a626ca7 Renommage méthode new 32aa66b Utilisation d'un meilleur nom de rapport de validation new 7df5e6a En fait pas besoin des droits en écriture pour l'action de validation The 3 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 7df5e6a231eaf0a4b77ae5ae9bd141720d83610f Author: Tony CHEMIT <chemit@codelutin.com> Date: Tue Aug 23 20:39:27 2016 +0200 En fait pas besoin des droits en écriture pour l'action de validation commit 32aa66bb1e2d8866acb7b0b70ff58d2b3f2c7965 Author: Tony CHEMIT <chemit@codelutin.com> Date: Tue Aug 23 20:39:05 2016 +0200 Utilisation d'un meilleur nom de rapport de validation commit a626ca779c070ecaaa8eb61ed42de4ab8769bf72 Author: Tony CHEMIT <chemit@codelutin.com> Date: Tue Aug 23 20:14:45 2016 +0200 Renommage méthode Summary of changes: .../observe/configuration/ObserveSwingApplicationConfig.java | 3 --- .../src/main/java/fr/ird/observe/ui/admin/AdminUIModel.java | 12 ++++++------ .../java/fr/ird/observe/ui/admin/export/ExportModel.java | 2 +- .../java/fr/ird/observe/ui/admin/validate/ValidateModel.java | 10 +++++----- .../i18n/observe-application-swing_fr_FR.properties | 2 +- 5 files changed, 13 insertions(+), 16 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 a626ca779c070ecaaa8eb61ed42de4ab8769bf72 Author: Tony CHEMIT <chemit@codelutin.com> Date: Tue Aug 23 20:14:45 2016 +0200 Renommage méthode --- .../src/main/java/fr/ird/observe/ui/admin/AdminUIModel.java | 2 +- .../src/main/java/fr/ird/observe/ui/admin/export/ExportModel.java | 2 +- 2 files changed, 2 insertions(+), 2 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 7aa0014..3d53cec 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 @@ -1422,7 +1422,7 @@ public class AdminUIModel extends WizardExtModel<AdminStep> { existingTrip.addAll(tripLonglineSet.getReferences()); - getExportModel().setExistingTripIds(existingTrip); + getExportModel().setExistingTrips(existingTrip); } diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/admin/export/ExportModel.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/admin/export/ExportModel.java index 7023bac..3a8f304 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/admin/export/ExportModel.java +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/admin/export/ExportModel.java @@ -79,7 +79,7 @@ public class ExportModel extends AdminActionModel { return existingTrips; } - public void setExistingTripIds(List<DataReference<?>> existingTrips) { + public void setExistingTrips(List<DataReference<?>> existingTrips) { this.existingTrips = existingTrips; } -- 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 32aa66bb1e2d8866acb7b0b70ff58d2b3f2c7965 Author: Tony CHEMIT <chemit@codelutin.com> Date: Tue Aug 23 20:39:05 2016 +0200 Utilisation d'un meilleur nom de rapport de validation --- .../observe/configuration/ObserveSwingApplicationConfig.java | 3 --- .../java/fr/ird/observe/ui/admin/validate/ValidateModel.java | 10 +++++----- 2 files changed, 5 insertions(+), 8 deletions(-) diff --git a/observe-application-swing/src/main/java/fr/ird/observe/configuration/ObserveSwingApplicationConfig.java b/observe-application-swing/src/main/java/fr/ird/observe/configuration/ObserveSwingApplicationConfig.java index e482d6e..006164a 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/configuration/ObserveSwingApplicationConfig.java +++ b/observe-application-swing/src/main/java/fr/ird/observe/configuration/ObserveSwingApplicationConfig.java @@ -85,9 +85,6 @@ public class ObserveSwingApplicationConfig extends ApplicationConfig { /** le pattern du fichier de sauvegarde d'une base access importée */ public static final String ACCESS_DB_PATTERN = "import-access-%1$tF--%1$tk-%1$tM-%1$tS.sql.gz"; - /** le pattern du fichier de rapport après validation */ - public static final String REPORT_PATTERN = "report-%1$tF--%1$tk-%1$tM-%1$tS.sql.gz"; - public static final String DB_NAME = "obstuna"; /** diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/admin/validate/ValidateModel.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/admin/validate/ValidateModel.java index c4b9cba..765027b 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/admin/validate/ValidateModel.java +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/admin/validate/ValidateModel.java @@ -24,7 +24,6 @@ package fr.ird.observe.ui.admin.validate; import com.google.common.collect.ImmutableSet; import com.google.common.collect.Lists; import com.google.common.collect.Sets; -import fr.ird.observe.configuration.ObserveSwingApplicationConfig; import fr.ird.observe.services.dto.AbstractReference; import fr.ird.observe.services.dto.IdDto; import fr.ird.observe.services.service.actions.validate.ValidateResultForDto; @@ -68,6 +67,9 @@ public class ValidateModel extends AdminActionModel { public static final String PROPERTY_MESSAGES = "messages"; + /** le pattern du fichier de rapport après validation */ + private static final String REPORT_PATTERN = "report-%1$tF--%1$tk-%1$tM-%1$tS.txt"; + /** Logger */ private static final Log log = LogFactory.getLog(ValidateModel.class); @@ -102,12 +104,10 @@ public class ValidateModel extends AdminActionModel { } /** - * @return le lastName par defaut du fichier de sauvegarde de la base locale - * (expression calculée à partir de la date courante et du pattern - * {@link ObserveSwingApplicationConfig#REPORT_PATTERN}). + * @return le nom par defaut du rapport de validation à enregistrer. */ public String getDefaultReportFilename() { - return String.format(ObserveSwingApplicationConfig.REPORT_PATTERN, new Date()); + return String.format(REPORT_PATTERN, new Date()); } public String getContextName() { -- 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 7df5e6a231eaf0a4b77ae5ae9bd141720d83610f Author: Tony CHEMIT <chemit@codelutin.com> Date: Tue Aug 23 20:39:27 2016 +0200 En fait pas besoin des droits en écriture pour l'action de validation --- .../src/main/java/fr/ird/observe/ui/admin/AdminUIModel.java | 10 +++++----- .../resources/i18n/observe-application-swing_fr_FR.properties | 2 +- 2 files changed, 6 insertions(+), 6 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 3d53cec..9e936dd 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 @@ -1091,19 +1091,19 @@ public class AdminUIModel extends WizardExtModel<AdminStep> { if (selectionModel.isUseData()) { // il faut les droits en Lecture sur les donnes - if (!(dataSourceInformation.canReadData() && dataSourceInformation.canWriteData())) { + if (!(dataSourceInformation.canReadData())) { if (log.isDebugEnabled()) { - log.debug("can not read and write data"); + log.debug("can not read data"); } return false; } } if (selectionModel.isUseReferentiel()) { - // il faut les droits en L/E sur le referentiel - if (!(dataSourceInformation.canReadReferential() && dataSourceInformation.canWriteReferential())) { + // il faut les droits en L sur le referentiel + if (!(dataSourceInformation.canReadReferential())) { if (log.isDebugEnabled()) { - log.debug("can not read and write referentiel"); + log.debug("can not read referentiel"); } return false; } diff --git a/observe-application-swing/src/main/resources/i18n/observe-application-swing_fr_FR.properties b/observe-application-swing/src/main/resources/i18n/observe-application-swing_fr_FR.properties index 5348eda..79aedb9 100644 --- a/observe-application-swing/src/main/resources/i18n/observe-application-swing_fr_FR.properties +++ b/observe-application-swing/src/main/resources/i18n/observe-application-swing_fr_FR.properties @@ -1796,7 +1796,7 @@ observe.error.storage.could.not.backup.unsane.local.db=Impossible d'enregistrer observe.error.storage.could.not.load.local.db=Impossible d'ouvrir la base locale pour la raison suivante \: %s observe.generateHtml.error= observe.info.selected.validators=Il faut au moins un validateur sélectionné pour continuer. -observe.info.validation.credentials=Pour valider le référentiel (resp. les données), vous devez posséder les droits en lecture-écriture correspondants. +observe.info.validation.credentials=Pour valider le référentiel (resp. les données), vous devez posséder les droits en lecture correspondants. observe.init.local.db.detected=%1$s détectée. observe.init.no.initial.dump.detected=Base embarquée %1$s non détectée. observe.init.no.local.db.detected=Base locale %1$s non détectée. -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.
participants (1)
-
codelutin.com scm