This is an automated email from the git hooks/post-receive script. New commit to branch feature/#8171 in repository echobase. See https://gitlab.nuiton.org/codelutin/echobase.git commit 72455302deac119654833cf9ebaac669d9ea0abb Author: Tony CHEMIT <chemit@codelutin.com> Date: Fri May 13 13:39:09 2016 +0200 Impact sur l'import du changement (renommage Transect#comment en comments) --- .../csv/VoyageCommonsTransectImportExportModel.java | 12 ++---------- .../resources/import-data/common/transect.csv.gz | Bin 21723 -> 21725 bytes 2 files changed, 2 insertions(+), 10 deletions(-) diff --git a/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/csv/VoyageCommonsTransectImportExportModel.java b/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/csv/VoyageCommonsTransectImportExportModel.java index a78cbde..48ea475 100644 --- a/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/csv/VoyageCommonsTransectImportExportModel.java +++ b/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/csv/VoyageCommonsTransectImportExportModel.java @@ -46,11 +46,7 @@ public class VoyageCommonsTransectImportExportModel extends EchoBaseImportExport model.newMandatoryColumn(Transect.PROPERTY_TITLE); model.newMandatoryColumn(Transect.PROPERTY_TRANSECT_ABSTRACT); model.newMandatoryColumn(Transect.PROPERTY_STRATUM); -<<<<<<< 90f1d7b89c449fafde7d2c70695ebf7da61c2e17 - model.newMandatoryColumn(Transect.PROPERTY_COMMENT); -======= - model.newMandatoryColumn("comment", Transect.PROPERTY_COMMENTS); ->>>>>>> Do no change import/export model + model.newMandatoryColumn(Transect.PROPERTY_COMMENTS); model.newMandatoryColumn(Transect.PROPERTY_DATE_CREATED, EchoBaseCsvUtil.IMPORT_DAY_TIME_ECHOBASE); model.newMandatoryColumn(Transect.PROPERTY_TIME_COVERAGE_START, EchoBaseCsvUtil.IMPORT_DAY_TIME_ECHOBASE); model.newMandatoryColumn(Transect.PROPERTY_TIME_COVERAGE_END, EchoBaseCsvUtil.IMPORT_DAY_TIME_ECHOBASE); @@ -73,11 +69,7 @@ public class VoyageCommonsTransectImportExportModel extends EchoBaseImportExport model.newColumnForExport(Transect.PROPERTY_TITLE); model.newColumnForExport(Transect.PROPERTY_TRANSECT_ABSTRACT); model.newColumnForExport(Transect.PROPERTY_STRATUM); -<<<<<<< 90f1d7b89c449fafde7d2c70695ebf7da61c2e17 - model.newColumnForExport(Transect.PROPERTY_COMMENT); -======= - model.newColumnForExport("comment", Transect.PROPERTY_COMMENTS); ->>>>>>> Do no change import/export model + model.newColumnForExport(Transect.PROPERTY_COMMENTS); model.newColumnForExport(Transect.PROPERTY_DATE_CREATED, EchoBaseCsvUtil.IMPORT_DAY_TIME_ECHOBASE); model.newColumnForExport(Transect.PROPERTY_TIME_COVERAGE_START, EchoBaseCsvUtil.IMPORT_DAY_TIME_ECHOBASE); model.newColumnForExport(Transect.PROPERTY_TIME_COVERAGE_END, EchoBaseCsvUtil.IMPORT_DAY_TIME_ECHOBASE); diff --git a/echobase-services/src/test/resources/import-data/common/transect.csv.gz b/echobase-services/src/test/resources/import-data/common/transect.csv.gz index ea5a516..6dddbaf 100644 Binary files a/echobase-services/src/test/resources/import-data/common/transect.csv.gz and b/echobase-services/src/test/resources/import-data/common/transect.csv.gz differ -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.