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 d361a1ab7b266a1c1ca5ea3400e4701b548f8016 Author: Tony CHEMIT <chemit@codelutin.com> Date: Fri Apr 29 10:01:02 2016 +0200 Merge ImportfileId model + fix develop merge --- echobase-domain/src/main/xmi/echobase.zargo | Bin 90396 -> 98247 bytes .../csv/VoyageCommonsTransectImportExportModel.java | 4 ++-- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/echobase-domain/src/main/xmi/echobase.zargo b/echobase-domain/src/main/xmi/echobase.zargo index e6c61d8..50b6da4 100644 Binary files a/echobase-domain/src/main/xmi/echobase.zargo and b/echobase-domain/src/main/xmi/echobase.zargo differ 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 d546994..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,7 +46,7 @@ public class VoyageCommonsTransectImportExportModel extends EchoBaseImportExport model.newMandatoryColumn(Transect.PROPERTY_TITLE); model.newMandatoryColumn(Transect.PROPERTY_TRANSECT_ABSTRACT); model.newMandatoryColumn(Transect.PROPERTY_STRATUM); - model.newMandatoryColumn(Transect.PROPERTY_COMMENT); + 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); @@ -69,7 +69,7 @@ public class VoyageCommonsTransectImportExportModel extends EchoBaseImportExport model.newColumnForExport(Transect.PROPERTY_TITLE); model.newColumnForExport(Transect.PROPERTY_TRANSECT_ABSTRACT); model.newColumnForExport(Transect.PROPERTY_STRATUM); - model.newColumnForExport(Transect.PROPERTY_COMMENT); + 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); -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.