This is an automated email from the git hooks/post-receive script. New commit to branch feature/8180 in repository echobase. See https://gitlab.nuiton.org/codelutin/echobase.git commit c81b19ad94ab59183b209a24f24694cd6cf35672 Author: Julien Ruchaud <julien.ruchaud@debux.org> Date: Wed Jun 22 14:00:38 2016 +0200 Fix description in modification logs --- .../services/service/importdata/ImportDataService.java | 7 ++++--- .../service/importdata/actions/ImportDataActionSupport.java | 13 +++++-------- 2 files changed, 9 insertions(+), 11 deletions(-) diff --git a/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/ImportDataService.java b/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/ImportDataService.java index bea7b8a..4867799 100644 --- a/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/ImportDataService.java +++ b/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/ImportDataService.java @@ -345,6 +345,7 @@ public class ImportDataService extends EchoBaseServiceSupport { // add result in log book and compute resume to show in result ImportLog importLog = importDataContext.getImportLog(); + String importSummary = computeImportSummary(importLog); String importType = getImportLabel(configuration); @@ -352,14 +353,13 @@ public class ImportDataService extends EchoBaseServiceSupport { importType, importLog.getImportUser(), importLog.getImportDate(), - importLog.getImportText()); + importSummary); // do commit persistenceService.commit(); TIME_LOG.log(s0, "importCommited"); - String importSummary = computeImportSummary(importLog); return new ImportDataResult<>(configuration, user, importDataContext.getResults(), importSummary); } catch (EchoBaseTechnicalException e) { @@ -379,7 +379,8 @@ public class ImportDataService extends EchoBaseServiceSupport { for (ImportFile importFile : importLog.getImportFile()) { String resultImportText = importFile.getImportText(); - builder.append("\nDepuis le fichier ").append(importFile.getName()).append("\n").append(resultImportText); + builder.append("Depuis le fichier ").append(importFile.getName()).append("\n\t") + .append(resultImportText).append("\n"); } return builder.toString(); } diff --git a/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/actions/ImportDataActionSupport.java b/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/actions/ImportDataActionSupport.java index 5658c02..6850bef 100644 --- a/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/actions/ImportDataActionSupport.java +++ b/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/actions/ImportDataActionSupport.java @@ -26,6 +26,7 @@ import fr.ifremer.echobase.entities.EchoBaseUser; import fr.ifremer.echobase.entities.EchoBaseUserEntityEnum; import fr.ifremer.echobase.entities.ImportFile; import fr.ifremer.echobase.entities.ImportFileId; +import fr.ifremer.echobase.entities.ImportLog; import fr.ifremer.echobase.entities.data.Cell; import fr.ifremer.echobase.entities.data.Data; import fr.ifremer.echobase.entities.references.DataMetadata; @@ -240,25 +241,21 @@ public abstract class ImportDataActionSupport<M extends ImportDataConfigurationS importText.append("\n\tEntité ").append(entityType).append(" ("); if (withCreated) { importText.append(numberCreated); - importText.append(" création(s) "); + importText.append(" création(s)"); } if (withUpdated) { importText.append(numberUpdated); - importText.append(" mise(s) à jour "); + importText.append(" mise(s) à jour"); } if (withNotImported) { importText.append(numberNotImported); - importText.append(" non importée(s) "); + importText.append(" non importée(s)"); } importText.append(")"); - } - ImportFile importFile = result.getImportFile(); - + importFile.setImportText(importText.toString().trim()); - persistenceService.addCheckedExportFile(importFile, result.getImportedExportFile()); - } @Override -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.