This is an automated email from the git hooks/post-receive script. New commit to branch feature/6688 in repository tutti. See http://git.codelutin.com/tutti.git commit 4db49131edbbc590ca094aefc8ed5215090f3e13 Author: Tony CHEMIT <chemit@codelutin.com> Date: Wed Mar 4 16:42:30 2015 +0100 executer les actions uniquement si demandé --- .../service/genericformat/importactions/DoCheckWeightAction.java | 5 ++++- .../service/genericformat/importactions/DoCleanWeightAction.java | 5 ++++- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/tutti-service/src/main/java/fr/ifremer/tutti/service/genericformat/importactions/DoCheckWeightAction.java b/tutti-service/src/main/java/fr/ifremer/tutti/service/genericformat/importactions/DoCheckWeightAction.java index b6dcd30..429745e 100644 --- a/tutti-service/src/main/java/fr/ifremer/tutti/service/genericformat/importactions/DoCheckWeightAction.java +++ b/tutti-service/src/main/java/fr/ifremer/tutti/service/genericformat/importactions/DoCheckWeightAction.java @@ -32,7 +32,10 @@ public class DoCheckWeightAction extends ImportActionSupport { @Override protected boolean canExecute() { - return importContext.isTechnicalFilesValid() && importContext.getCatchFileResult().isValid() && importContext.getMarineLitterFileResult().isValid(); + return importContext.getImportRequest().isCheckWeights() + && importContext.isTechnicalFilesValid() + && importContext.getCatchFileResult().isValid() + && importContext.getMarineLitterFileResult().isValid(); } @Override diff --git a/tutti-service/src/main/java/fr/ifremer/tutti/service/genericformat/importactions/DoCleanWeightAction.java b/tutti-service/src/main/java/fr/ifremer/tutti/service/genericformat/importactions/DoCleanWeightAction.java index ad7a270..48914ee 100644 --- a/tutti-service/src/main/java/fr/ifremer/tutti/service/genericformat/importactions/DoCleanWeightAction.java +++ b/tutti-service/src/main/java/fr/ifremer/tutti/service/genericformat/importactions/DoCleanWeightAction.java @@ -30,7 +30,10 @@ public class DoCleanWeightAction extends ImportActionSupport { @Override protected boolean canExecute() { - return importContext.isTechnicalFilesValid() && importContext.getCatchFileResult().isValid() && importContext.getMarineLitterFileResult().isValid(); + return importContext.getImportRequest().isCleanWeights() + && importContext.isTechnicalFilesValid() + && importContext.getCatchFileResult().isValid() + && importContext.getMarineLitterFileResult().isValid(); } @Override -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.