branch develop updated (e004221 -> 26ae9d2)
This is an automated email from the git hooks/post-receive script. New change to branch develop in repository echobase. See http://git.codelutin.com/echobase.git from e004221 [jgitflow-maven-plugin]Updating develop poms back to pre merge state new 87cbc54 Passage sur la dernière version de codelutinpom new 47365c8 Utilisation de struts.properties pour y stoquer la taille max autorisé pour un upload (See #7900) new e5a8cc1 Chargement dans le context applicatif de la taille max d'un upload et propagation dans les actions concernées new 3fe440f Mise en place du contrôle de la taille côté client new 1751642 Amélioration de la validation du formulaire d'import common new 26ae9d2 Fixes #7900. Merge branch 'feature/7900' into develop The 6 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 26ae9d229b1411dc26e0a867a2d7a8976de071a7 Merge: 87cbc54 1751642 Author: Tony CHEMIT <chemit@codelutin.com> Date: Tue Jan 12 20:24:28 2016 +0100 Fixes #7900. Merge branch 'feature/7900' into develop commit 87cbc54067724bf12a170d035379a146f5aee88a Author: Tony CHEMIT <chemit@codelutin.com> Date: Tue Jan 12 15:26:38 2016 +0100 Passage sur la dernière version de codelutinpom commit 1751642b7204687aa4b151a28508d6a71e54461c Author: Tony CHEMIT <chemit@codelutin.com> Date: Tue Jan 12 20:23:35 2016 +0100 Amélioration de la validation du formulaire d'import common commit 3fe440fd810840705446db62eca81fa78dd3edcb Author: Tony CHEMIT <chemit@codelutin.com> Date: Tue Jan 12 20:22:10 2016 +0100 Mise en place du contrôle de la taille côté client commit e5a8cc1b11fed5f7b7cd8580c72687a61f0d4ba5 Author: Tony CHEMIT <chemit@codelutin.com> Date: Tue Jan 12 20:20:36 2016 +0100 Chargement dans le context applicatif de la taille max d'un upload et propagation dans les actions concernées commit 47365c8dc7b3eb61ba5c9e4c9358239c2562adae Author: Tony CHEMIT <chemit@codelutin.com> Date: Tue Jan 12 20:18:32 2016 +0100 Utilisation de struts.properties pour y stoquer la taille max autorisé pour un upload (See #7900) Summary of changes: .../echobase/ui/EchoBaseApplicationContext.java | 36 ++++++++-- .../importData/AbstractConfigureImport.java | 4 ++ .../actions/importData/ConfigureCommonImport.java | 84 +++++++++++++++++++--- .../echobase/ui/actions/importDb/Configure.java | 4 ++ ...onImport-configureCommon-modeAll-validation.xml | 28 ++++---- ...ort-configureCommon-modeTransect-validation.xml | 14 ++-- ...port-configureCommon-modeTransit-validation.xml | 8 +-- ...mport-configureCommon-modeVoyage-validation.xml | 14 ++-- echobase-ui/src/main/resources/struts.properties | 2 + echobase-ui/src/main/resources/struts.xml | 1 - .../src/main/webapp/WEB-INF/includes/metas.jsp | 28 +++++++- .../jsp/importData/configureAcousticImport.jsp | 1 + .../jsp/importData/configureCatchesImport.jsp | 2 +- .../jsp/importData/configureCommonImport.jsp | 67 ++++++++--------- .../jsp/importData/configureOperationImport.jsp | 7 ++ .../jsp/importData/configureResultsImport.jsp | 2 + .../main/webapp/WEB-INF/jsp/importDb/configure.jsp | 7 ++ pom.xml | 2 +- 18 files changed, 226 insertions(+), 85 deletions(-) create mode 100644 echobase-ui/src/main/resources/struts.properties -- 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 echobase. See http://git.codelutin.com/echobase.git commit 47365c8dc7b3eb61ba5c9e4c9358239c2562adae Author: Tony CHEMIT <chemit@codelutin.com> Date: Tue Jan 12 20:18:32 2016 +0100 Utilisation de struts.properties pour y stoquer la taille max autorisé pour un upload (See #7900) --- echobase-ui/src/main/resources/struts.properties | 2 ++ echobase-ui/src/main/resources/struts.xml | 1 - 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/echobase-ui/src/main/resources/struts.properties b/echobase-ui/src/main/resources/struts.properties new file mode 100644 index 0000000..b81e8b2 --- /dev/null +++ b/echobase-ui/src/main/resources/struts.properties @@ -0,0 +1,2 @@ +#Ne pas déplacer dans le fichier xml car ce fichier est lue au démarrage de l'application +struts.multipart.maxSize=419430400 diff --git a/echobase-ui/src/main/resources/struts.xml b/echobase-ui/src/main/resources/struts.xml index 9b6be41..0331f5b 100644 --- a/echobase-ui/src/main/resources/struts.xml +++ b/echobase-ui/src/main/resources/struts.xml @@ -53,7 +53,6 @@ <!--<constant name="struts.i18n.reload" value="false"/>--> <!--<constant name="struts.configuration.xml.reload" value="false"/>--> <constant name="struts.ui.theme" value="css_xhtml"/> - <constant name="struts.multipart.maxSize" value="419430400"/> <!--Performance tuning--> <!--see http://struts.apache.org/2.2.3/docs/performance-tuning.html--> -- 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 echobase. See http://git.codelutin.com/echobase.git commit e5a8cc1b11fed5f7b7cd8580c72687a61f0d4ba5 Author: Tony CHEMIT <chemit@codelutin.com> Date: Tue Jan 12 20:20:36 2016 +0100 Chargement dans le context applicatif de la taille max d'un upload et propagation dans les actions concernées --- .../echobase/ui/EchoBaseApplicationContext.java | 36 +++++++++++++++++----- .../importData/AbstractConfigureImport.java | 4 +++ .../echobase/ui/actions/importDb/Configure.java | 4 +++ 3 files changed, 37 insertions(+), 7 deletions(-) diff --git a/echobase-ui/src/main/java/fr/ifremer/echobase/ui/EchoBaseApplicationContext.java b/echobase-ui/src/main/java/fr/ifremer/echobase/ui/EchoBaseApplicationContext.java index 10fc11e..70a36d9 100644 --- a/echobase-ui/src/main/java/fr/ifremer/echobase/ui/EchoBaseApplicationContext.java +++ b/echobase-ui/src/main/java/fr/ifremer/echobase/ui/EchoBaseApplicationContext.java @@ -53,6 +53,7 @@ import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.apache.log4j.LogManager; import org.apache.log4j.PropertyConfigurator; +import org.apache.struts2.StrutsConstants; import org.nuiton.i18n.I18n; import org.nuiton.i18n.init.DefaultI18nInitializer; import org.nuiton.topia.persistence.TopiaException; @@ -66,6 +67,8 @@ import java.io.BufferedReader; import java.io.BufferedWriter; import java.io.File; import java.io.IOException; +import java.io.InputStream; +import java.net.URL; import java.util.List; import java.util.Locale; import java.util.Map; @@ -135,6 +138,11 @@ public class EchoBaseApplicationContext { */ protected boolean defaultUsersCreated; + /** + * Max upload file size. + */ + protected long uploadFileMaxLength; + public Set<EchoBaseSession> getEchoBaseSessions() { return sessions; } @@ -147,7 +155,7 @@ public class EchoBaseApplicationContext { } if (log.isInfoEnabled()) { log.info("Register user session for [" + - session.getUser().getEmail() + "]"); + session.getUser().getEmail() + "]"); } sessions.add(session); } @@ -158,7 +166,7 @@ public class EchoBaseApplicationContext { Preconditions.checkNotNull(sessions); if (log.isInfoEnabled()) { log.info("Destroy user session for [" + - session.getUser().getEmail() + "]"); + session.getUser().getEmail() + "]"); } // remove session from active ones sessions.remove(session); @@ -192,7 +200,7 @@ public class EchoBaseApplicationContext { initLog(configuration); } catch (IOException e) { Logger.getAnonymousLogger().log(Level.ALL, - "Could not init logger.", e); + "Could not init logger.", e); } if (log.isInfoEnabled()) { @@ -235,6 +243,16 @@ public class EchoBaseApplicationContext { } + URL resource = getClass().getResource("/struts.properties"); + Properties strutsProperties = new Properties(); + try (InputStream inputStream = resource.openStream()) { + strutsProperties.load(inputStream); + } catch (IOException e) { + throw new TopiaException("Could not load struts configuration", e); + } + String property = strutsProperties.getProperty(StrutsConstants.STRUTS_MULTIPART_MAXSIZE); + uploadFileMaxLength = Long.valueOf(property); + log.info("uploadFileMaxLength: " + uploadFileMaxLength); } @@ -333,7 +351,7 @@ public class EchoBaseApplicationContext { // no users in database create the admin user if (log.isInfoEnabled()) { log.info("No user in database, will create default " + - "users."); + "users."); } service.createDefaultUsers(); @@ -343,7 +361,7 @@ public class EchoBaseApplicationContext { if (log.isInfoEnabled()) { log.info("Will try to create default working db " + - "configuration for internal db."); + "configuration for internal db."); } // try to create a default embedded working db configuration serviceContext.newService(WorkingDbConfigurationService.class). @@ -416,7 +434,7 @@ public class EchoBaseApplicationContext { // copy it from class-path if (log.isInfoEnabled()) { log.info("Copy embedded resource " + pilotFileName + - " to directory " + libDirectory); + " to directory " + libDirectory); } EmbeddedApplicationService.copyEmbeddedBinaryFile(pilotFileName, libDirectory); } @@ -430,7 +448,7 @@ public class EchoBaseApplicationContext { // copy it from class-path if (log.isInfoEnabled()) { log.info("Copy embedded war " + embeddedWarFileName + - " to directory " + embeddedWarDirectory); + " to directory " + embeddedWarDirectory); } EmbeddedApplicationService.copyEmbeddedBinaryFile(embeddedWarFileName, embeddedWarDirectory); } @@ -465,4 +483,8 @@ public class EchoBaseApplicationContext { } } + + public long getUploadFileMaxLength() { + return uploadFileMaxLength; + } } diff --git a/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/importData/AbstractConfigureImport.java b/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/importData/AbstractConfigureImport.java index 6dbbb03..8c8fba9 100644 --- a/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/importData/AbstractConfigureImport.java +++ b/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/importData/AbstractConfigureImport.java @@ -50,6 +50,10 @@ public abstract class AbstractConfigureImport<M extends AbstractImportConfigurat super(modelType); } + public long getUploadFileMaxLength() { + return getEchoBaseApplicationContext().getUploadFileMaxLength(); + } + @Override protected void prepareExecuteAction(M model) throws IOException { File tempDirectory = FileUtils.getTempDirectory(); diff --git a/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/importDb/Configure.java b/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/importDb/Configure.java index 3a644fc..ff29fe6 100644 --- a/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/importDb/Configure.java +++ b/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/importDb/Configure.java @@ -55,6 +55,10 @@ public class Configure extends AbstractConfigureAction<ImportDbConfiguration> { return modes; } + public long getUploadFileMaxLength() { + return getEchoBaseApplicationContext().getUploadFileMaxLength(); + } + public Configure() { super(ImportDbConfiguration.class); } -- 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 echobase. See http://git.codelutin.com/echobase.git commit 3fe440fd810840705446db62eca81fa78dd3edcb Author: Tony CHEMIT <chemit@codelutin.com> Date: Tue Jan 12 20:22:10 2016 +0100 Mise en place du contrôle de la taille côté client --- .../src/main/webapp/WEB-INF/includes/metas.jsp | 28 +++++++++++++++++++++- .../jsp/importData/configureAcousticImport.jsp | 1 + .../jsp/importData/configureCatchesImport.jsp | 2 +- .../jsp/importData/configureOperationImport.jsp | 7 ++++++ .../jsp/importData/configureResultsImport.jsp | 2 ++ .../main/webapp/WEB-INF/jsp/importDb/configure.jsp | 7 ++++++ 6 files changed, 45 insertions(+), 2 deletions(-) diff --git a/echobase-ui/src/main/webapp/WEB-INF/includes/metas.jsp b/echobase-ui/src/main/webapp/WEB-INF/includes/metas.jsp index ab28abd..4908728 100644 --- a/echobase-ui/src/main/webapp/WEB-INF/includes/metas.jsp +++ b/echobase-ui/src/main/webapp/WEB-INF/includes/metas.jsp @@ -29,5 +29,31 @@ href="<s:url value='/css/screen.css' />"/> <link rel="icon" type="image/png" href="<s:url value='/images/logo_codelutin.png' />"/> - <sj:head jqueryui="true" jquerytheme="echobase-theme" debug="true" compressed="false" /> + <sj:head jqueryui="true" jquerytheme="echobase-theme" debug="true" compressed="false"/> + <script type="text/javascript"> + + jQuery(document).ready(function () { + + $.addCheckFileSize = function(uploadFileMaxLength) { + + var locale = '<s:property value="locale"/>'; + console.info("Locale: "+locale); + $('input[type="file"]').bind("change", function() { + if (this.value) { + var file = this.files[0]; + var length = file.size; + + if (length > uploadFileMaxLength) { + var message = locale.indexOf('fr')>0 + ?"File " + file.name + " exceeded allowed size limit!\n o Max size allowed: " + uploadFileMaxLength + "\n o file size: " + length + :"Le fichier " + file.name + " depasse la taille maximum autorisee!\n o taille maximum autorisee : " + uploadFileMaxLength + "\n o taille du fichier : " + length; + alert(message); + this.value = ''; + } + } + }); + }; + + }); + </script> </head> diff --git a/echobase-ui/src/main/webapp/WEB-INF/jsp/importData/configureAcousticImport.jsp b/echobase-ui/src/main/webapp/WEB-INF/jsp/importData/configureAcousticImport.jsp index dff6090..87c36ac 100644 --- a/echobase-ui/src/main/webapp/WEB-INF/jsp/importData/configureAcousticImport.jsp +++ b/echobase-ui/src/main/webapp/WEB-INF/jsp/importData/configureAcousticImport.jsp @@ -32,6 +32,7 @@ jQuery(document).ready(function () { + $.addCheckFileSize(<s:property value="uploadFileMaxLength"/>); $.autoSelectVoyageAndVessel( $('[name="model.voyageId"]'), $('[name="model.vesselId"]'), diff --git a/echobase-ui/src/main/webapp/WEB-INF/jsp/importData/configureCatchesImport.jsp b/echobase-ui/src/main/webapp/WEB-INF/jsp/importData/configureCatchesImport.jsp index a7c7a0a..73d39b0 100644 --- a/echobase-ui/src/main/webapp/WEB-INF/jsp/importData/configureCatchesImport.jsp +++ b/echobase-ui/src/main/webapp/WEB-INF/jsp/importData/configureCatchesImport.jsp @@ -31,7 +31,7 @@ <script type="text/javascript"> jQuery(document).ready(function () { - + $.addCheckFileSize(<s:property value="uploadFileMaxLength"/>); }); </script> diff --git a/echobase-ui/src/main/webapp/WEB-INF/jsp/importData/configureOperationImport.jsp b/echobase-ui/src/main/webapp/WEB-INF/jsp/importData/configureOperationImport.jsp index 5f8cf3b..7b6839b 100644 --- a/echobase-ui/src/main/webapp/WEB-INF/jsp/importData/configureOperationImport.jsp +++ b/echobase-ui/src/main/webapp/WEB-INF/jsp/importData/configureOperationImport.jsp @@ -28,6 +28,13 @@ Configuration <s:text name="echobase.common.importType.operation"/> </title> +<script type="text/javascript"> + + jQuery(document).ready(function () { + $.addCheckFileSize(<s:property value="uploadFileMaxLength"/>); + }); +</script> + <s:form namespace="/importData" method="POST" enctype="multipart/form-data"> <fieldset> diff --git a/echobase-ui/src/main/webapp/WEB-INF/jsp/importData/configureResultsImport.jsp b/echobase-ui/src/main/webapp/WEB-INF/jsp/importData/configureResultsImport.jsp index 3b24ba7..64e8720 100644 --- a/echobase-ui/src/main/webapp/WEB-INF/jsp/importData/configureResultsImport.jsp +++ b/echobase-ui/src/main/webapp/WEB-INF/jsp/importData/configureResultsImport.jsp @@ -32,6 +32,8 @@ jQuery(document).ready(function () { + $.addCheckFileSize(<s:property value="uploadFileMaxLength"/>); + // to change form when mode is changed $('[name="model.importType"]').change(function (event) { $('[class~="importType"]').hide(); diff --git a/echobase-ui/src/main/webapp/WEB-INF/jsp/importDb/configure.jsp b/echobase-ui/src/main/webapp/WEB-INF/jsp/importDb/configure.jsp index 3040596..a0e7636 100644 --- a/echobase-ui/src/main/webapp/WEB-INF/jsp/importDb/configure.jsp +++ b/echobase-ui/src/main/webapp/WEB-INF/jsp/importDb/configure.jsp @@ -23,6 +23,13 @@ <title><s:text name="echobase.title.importDb"/></title> +<script type="text/javascript"> + + jQuery(document).ready(function () { + $.addCheckFileSize(<s:property value="uploadFileMaxLength"/>); + }); +</script> + <s:form namespace="/importDb" method="POST" enctype="multipart/form-data"> <fieldset> <legend> -- 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 echobase. See http://git.codelutin.com/echobase.git commit 1751642b7204687aa4b151a28508d6a71e54461c Author: Tony CHEMIT <chemit@codelutin.com> Date: Tue Jan 12 20:23:35 2016 +0100 Amélioration de la validation du formulaire d'import common --- .../actions/importData/ConfigureCommonImport.java | 84 +++++++++++++++++++--- ...onImport-configureCommon-modeAll-validation.xml | 28 ++++---- ...ort-configureCommon-modeTransect-validation.xml | 14 ++-- ...port-configureCommon-modeTransit-validation.xml | 8 +-- ...mport-configureCommon-modeVoyage-validation.xml | 14 ++-- .../jsp/importData/configureCommonImport.jsp | 67 ++++++++--------- 6 files changed, 141 insertions(+), 74 deletions(-) diff --git a/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/importData/ConfigureCommonImport.java b/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/importData/ConfigureCommonImport.java index e71fb82..a96e7d7 100644 --- a/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/importData/ConfigureCommonImport.java +++ b/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/importData/ConfigureCommonImport.java @@ -26,6 +26,8 @@ import fr.ifremer.echobase.entities.data.Voyage; import fr.ifremer.echobase.entities.references.AreaOfOperation; import fr.ifremer.echobase.entities.references.Mission; import fr.ifremer.echobase.services.service.importdata.CommonImportConfiguration; +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; import java.io.File; import java.util.Map; @@ -40,6 +42,9 @@ public class ConfigureCommonImport extends AbstractConfigureImport<CommonImportC private static final long serialVersionUID = 1L; + /** Logger. */ + private static final Log log = LogFactory.getLog(ConfigureCommonImport.class); + /** Universe of existing missions. */ protected Map<String, String> missions; @@ -114,39 +119,100 @@ public class ConfigureCommonImport extends AbstractConfigureImport<CommonImportC return importTypes; } - public void setVoyageFile(File file) { + // mode Voyage + + public CommonImportConfiguration getModelVoyage() { + return getModel(); + } + + public void setModelVoyageVoyageFile(File file) { + getModel().getVoyageFile().setFile(file); + } + + public void setModelVoyageVoyageFileContentType(String contentType) { + getModel().getVoyageFile().setContentType(contentType); + } + + public void setModelVoyageVoyageFileFileName(String fileName) { + getModel().getVoyageFile().setFileName(fileName); + } + + // mode transit + + public CommonImportConfiguration getModelTransit() { + return getModel(); + } + + public void setModelTransitTransitFile(File file) { + getModel().getTransitFile().setFile(file); + } + + public void setModelTransitTransitFileContentType(String contentType) { + getModel().getTransitFile().setContentType(contentType); + } + + public void setModelTransitFileFileName(String fileName) { + getModel().getTransitFile().setFileName(fileName); + } + + // mode transect + + + public CommonImportConfiguration getModelTransect() { + return getModel(); + } + + public void setModelTransectTransectFile(File file) { + getModel().getTransectFile().setFile(file); + } + + public void setModelTransectTransectFileContentType(String contentType) { + getModel().getTransectFile().setContentType(contentType); + } + + public void setModelTransectTransectFileFileName(String fileName) { + getModel().getTransectFile().setFileName(fileName); + } + + // mode All + + public CommonImportConfiguration getModelAll() { + return getModel(); + } + + public void setModelAllVoyageFile(File file) { getModel().getVoyageFile().setFile(file); } - public void setVoyageFileContentType(String contentType) { + public void setModelAllVoyageFileContentType(String contentType) { getModel().getVoyageFile().setContentType(contentType); } - public void setVoyageFileFileName(String fileName) { + public void setModelAllVoyageFileFileName(String fileName) { getModel().getVoyageFile().setFileName(fileName); } - public void setTransitFile(File file) { + public void setModelAllTransitFile(File file) { getModel().getTransitFile().setFile(file); } - public void setTransitFileContentType(String contentType) { + public void setModelAllTransitFileContentType(String contentType) { getModel().getTransitFile().setContentType(contentType); } - public void setTransitFileFileName(String fileName) { + public void setModelAllTransitFileFileName(String fileName) { getModel().getTransitFile().setFileName(fileName); } - public void setTransectFile(File file) { + public void setModelAllTransectFile(File file) { getModel().getTransectFile().setFile(file); } - public void setTransectFileContentType(String contentType) { + public void setModelAllTransectFileContentType(String contentType) { getModel().getTransectFile().setContentType(contentType); } - public void setTransectFileFileName(String fileName) { + public void setModelAllTransectFileFileName(String fileName) { getModel().getTransectFile().setFileName(fileName); } diff --git a/echobase-ui/src/main/resources/fr/ifremer/echobase/ui/actions/importData/ConfigureCommonImport-configureCommon-modeAll-validation.xml b/echobase-ui/src/main/resources/fr/ifremer/echobase/ui/actions/importData/ConfigureCommonImport-configureCommon-modeAll-validation.xml index b387175..b9d3cc1 100644 --- a/echobase-ui/src/main/resources/fr/ifremer/echobase/ui/actions/importData/ConfigureCommonImport-configureCommon-modeAll-validation.xml +++ b/echobase-ui/src/main/resources/fr/ifremer/echobase/ui/actions/importData/ConfigureCommonImport-configureCommon-modeAll-validation.xml @@ -20,72 +20,72 @@ "http://struts.apache.org/dtds/xwork-validator-1.0.3.dtd"> <validators> - <field name="model.missionId"> + <field name="modelAll.missionId"> <field-validator type="nrequiredstring"> <message key="echobase.error.import.mission.required"/> </field-validator> </field> - <field name="model.areaOfOperationId"> + <field name="modelAll.areaOfOperationId"> <field-validator type="nrequiredstring"> <message key="echobase.error.import.areaOfOperation.required"/> </field-validator> </field> - <field name="model.voyageDescription"> + <field name="modelAll.voyageDescription"> <field-validator type="nrequiredstring"> <message key="echobase.error.import.voyageDescription.required"/> </field-validator> </field> - <field name="model.transitRelatedActivity"> + <field name="modelAll.transitRelatedActivity"> <field-validator type="nrequiredstring"> <message key="echobase.error.import.transitRelatedActivity.required"/> </field-validator> </field> - <field name="model.transectLicence"> + <field name="modelAll.transectLicence"> <field-validator type="nrequiredstring"> <message key="echobase.error.import.transectLicence.required"/> </field-validator> </field> - <field name="model.transectGeospatialVerticalPositive"> + <field name="modelAll.transectGeospatialVerticalPositive"> <field-validator type="nrequiredstring"> <message key="echobase.error.import.transectGeospatialVerticalPositive.required"/> </field-validator> </field> - <field name="model.transectBinUnitsPingAxis"> + <field name="modelAll.transectBinUnitsPingAxis"> <field-validator type="nrequiredstring"> <message key="echobase.error.import.transectBinUnitsPingAxis.required"/> </field-validator> </field> - <field name="model.datum"> + <field name="modelAll.datum"> <field-validator type="nrequiredstring"> <message key="echobase.error.import.datum.required"/> </field-validator> </field> - <field name="voyageFile"> + <field name="modelAllVoyageFile"> <field-validator type="nfieldexpression"> - <param name="expression">model.voyageFile.file!=null</param> + <param name="expression">modelAll.voyageFile.file != null</param> <message key="echobase.error.import.voyageFile.required"/> </field-validator> </field> - <field name="transitFile"> + <field name="modelAllTransitFile"> <field-validator type="nfieldexpression"> - <param name="expression">model.transitFile.file!=null</param> + <param name="expression">modelAll.transitFile.file != null</param> <message key="echobase.error.import.transitFile.required"/> </field-validator> </field> - <field name="transectFile"> + <field name="modelAllTransectFile"> <field-validator type="nfieldexpression"> - <param name="expression">model.transectFile.file!=null</param> + <param name="expression">modelAll.transectFile.file != null</param> <message key="echobase.error.import.transectFile.required"/> </field-validator> </field> diff --git a/echobase-ui/src/main/resources/fr/ifremer/echobase/ui/actions/importData/ConfigureCommonImport-configureCommon-modeTransect-validation.xml b/echobase-ui/src/main/resources/fr/ifremer/echobase/ui/actions/importData/ConfigureCommonImport-configureCommon-modeTransect-validation.xml index b34052a..0e7e89b 100644 --- a/echobase-ui/src/main/resources/fr/ifremer/echobase/ui/actions/importData/ConfigureCommonImport-configureCommon-modeTransect-validation.xml +++ b/echobase-ui/src/main/resources/fr/ifremer/echobase/ui/actions/importData/ConfigureCommonImport-configureCommon-modeTransect-validation.xml @@ -20,40 +20,40 @@ "http://struts.apache.org/dtds/xwork-validator-1.0.3.dtd"> <validators> - <field name="model.voyageId"> + <field name="modelTransect.voyageId"> <field-validator type="nrequiredstring"> <message key="echobase.error.import.voyage.required"/> </field-validator> </field> - <field name="model.transectLicence"> + <field name="modelTransect.transectLicence"> <field-validator type="nrequiredstring"> <message key="echobase.error.import.transectLicence.required"/> </field-validator> </field> - <field name="model.transectGeospatialVerticalPositive"> + <field name="modelTransect.transectGeospatialVerticalPositive"> <field-validator type="nrequiredstring"> <message key="echobase.error.import.transectGeospatialVerticalPositive.required"/> </field-validator> </field> - <field name="model.transectBinUnitsPingAxis"> + <field name="modelTransect.transectBinUnitsPingAxis"> <field-validator type="nrequiredstring"> <message key="echobase.error.import.transectBinUnitsPingAxis.required"/> </field-validator> </field> - <field name="model.datum"> + <field name="modelTransect.datum"> <field-validator type="nrequiredstring"> <message key="echobase.error.import.datum.required"/> </field-validator> </field> - <field name="transectFile"> + <field name="modelTransectTransectFile"> <field-validator type="nfieldexpression"> - <param name="expression">model.transectFile.file!=null</param> + <param name="expression">modelTransect.transectFile.file != null</param> <message key="echobase.error.import.transectFile.required"/> </field-validator> </field> diff --git a/echobase-ui/src/main/resources/fr/ifremer/echobase/ui/actions/importData/ConfigureCommonImport-configureCommon-modeTransit-validation.xml b/echobase-ui/src/main/resources/fr/ifremer/echobase/ui/actions/importData/ConfigureCommonImport-configureCommon-modeTransit-validation.xml index 1abdbcd..d765d89 100644 --- a/echobase-ui/src/main/resources/fr/ifremer/echobase/ui/actions/importData/ConfigureCommonImport-configureCommon-modeTransit-validation.xml +++ b/echobase-ui/src/main/resources/fr/ifremer/echobase/ui/actions/importData/ConfigureCommonImport-configureCommon-modeTransit-validation.xml @@ -20,21 +20,21 @@ "http://struts.apache.org/dtds/xwork-validator-1.0.3.dtd"> <validators> - <field name="model.voyageId"> + <field name="modelTransit.voyageId"> <field-validator type="nrequiredstring"> <message key="echobase.error.import.voyage.required"/> </field-validator> </field> - <field name="model.transitRelatedActivity"> + <field name="modelTransit.transitRelatedActivity"> <field-validator type="nrequiredstring"> <message key="echobase.error.import.transitRelatedActivity.required"/> </field-validator> </field> - <field name="transitFile"> + <field name="modelTransitTransitFile"> <field-validator type="nfieldexpression"> - <param name="expression">model.transitFile.file!=null</param> + <param name="expression">modelTransit.transitFile.file != null</param> <message key="echobase.error.import.transitFile.required"/> </field-validator> </field> diff --git a/echobase-ui/src/main/resources/fr/ifremer/echobase/ui/actions/importData/ConfigureCommonImport-configureCommon-modeVoyage-validation.xml b/echobase-ui/src/main/resources/fr/ifremer/echobase/ui/actions/importData/ConfigureCommonImport-configureCommon-modeVoyage-validation.xml index 82e890d..826d615 100644 --- a/echobase-ui/src/main/resources/fr/ifremer/echobase/ui/actions/importData/ConfigureCommonImport-configureCommon-modeVoyage-validation.xml +++ b/echobase-ui/src/main/resources/fr/ifremer/echobase/ui/actions/importData/ConfigureCommonImport-configureCommon-modeVoyage-validation.xml @@ -17,36 +17,36 @@ #L% --> <!DOCTYPE validators PUBLIC "-//Apache Struts//XWork Validator 1.0.3//EN" - "http://struts.apache.org/dtds/xwork-validator-1.0.3.dtd"> + "http://struts.apache.org/dtds/xwork-validator-1.0.3.dtd"> <validators> - <field name="model.missionId"> + <field name="modelVoyage.missionId"> <field-validator type="nrequiredstring"> <message key="echobase.error.import.mission.required"/> </field-validator> </field> - <field name="model.areaOfOperationId"> + <field name="modelVoyage.areaOfOperationId"> <field-validator type="nrequiredstring"> <message key="echobase.error.import.areaOfOperation.required"/> </field-validator> </field> - <field name="model.voyageDescription"> + <field name="modelVoyage.voyageDescription"> <field-validator type="nrequiredstring"> <message key="echobase.error.import.voyageDescription.required"/> </field-validator> </field> - <field name="model.datum"> + <field name="modelVoyage.datum"> <field-validator type="nrequiredstring"> <message key="echobase.error.import.datum.required"/> </field-validator> </field> - <field name="voyageFile"> + <field name="modelVoyageVoyageFile"> <field-validator type="nfieldexpression"> - <param name="expression">model.voyageFile.file!=null</param> + <param name="expression">modelVoyage.voyageFile.file != null</param> <message key="echobase.error.import.voyageFile.required"/> </field-validator> </field> diff --git a/echobase-ui/src/main/webapp/WEB-INF/jsp/importData/configureCommonImport.jsp b/echobase-ui/src/main/webapp/WEB-INF/jsp/importData/configureCommonImport.jsp index 77fcdfd..647fae7 100644 --- a/echobase-ui/src/main/webapp/WEB-INF/jsp/importData/configureCommonImport.jsp +++ b/echobase-ui/src/main/webapp/WEB-INF/jsp/importData/configureCommonImport.jsp @@ -38,6 +38,7 @@ var incomingVal = $('[name="model.importType"][checked="checked"]').val(); $('#' + incomingVal).show(); + $.addCheckFileSize(<s:property value="uploadFileMaxLength"/>); }); </script> @@ -64,46 +65,46 @@ </div> <br/> - <s:select key="model.missionId" requiredLabel="true" + <s:select key="modelAll.missionId" requiredLabel="true" label='%{getText("echobase.common.mission")}' list="missions" headerKey="" headerValue=""/> <br/> - <s:hidden key="model.importType" value="COMMON_ALL" label=''/> + <s:hidden key="modelAll.importType" value="COMMON_ALL" label=''/> - <s:select key="model.areaOfOperationId" requiredLabel="true" + <s:select key="modelAll.areaOfOperationId" requiredLabel="true" label='%{getText("echobase.common.areaOfOperation")}' list="areaOfOperations" headerKey="" headerValue=""/> - <s:textfield key="model.voyageDescription" size="80" requiredLabel="true" + <s:textfield key="modelAll.voyageDescription" size="80" requiredLabel="true" label='%{getText("echobase.common.voyageDescription")}'/> - <s:textfield key="model.datum" size="80" requiredLabel="true" + <s:textfield key="modelAll.datum" size="80" requiredLabel="true" label='%{getText("echobase.common.datum")}'/> - <s:textfield key="model.transitRelatedActivity" size="80" requiredLabel="true" + <s:textfield key="modelAll.transitRelatedActivity" size="80" requiredLabel="true" label='%{getText("echobase.common.transitRelatedActivity")}'/> - <s:textfield key="model.transectLicence" size="80" requiredLabel="true" + <s:textfield key="modelAll.transectLicence" size="80" requiredLabel="true" label='%{getText("echobase.common.transectLicence")}'/> - <s:textfield key="model.transectGeospatialVerticalPositive" size="80" + <s:textfield key="modelAll.transectGeospatialVerticalPositive" size="80" requiredLabel="true" label='%{getText("echobase.common.transectGeospatialVerticalPositive")}'/> - <s:textfield key="model.transectBinUnitsPingAxis" size="80" requiredLabel="true" + <s:textfield key="modelAll.transectBinUnitsPingAxis" size="80" requiredLabel="true" label='%{getText("echobase.common.transectBinUnitsPingAxis")}'/> - <s:file key="voyageFile" requiredLabel="true" + <s:file key="modelAllVoyageFile" requiredLabel="true" label='%{getText("echobase.common.voyageFile")}'/> - <s:file key="transitFile" requiredLabel="true" + <s:file key="modelAllTransitFile" requiredLabel="true" label='%{getText("echobase.common.transitFile")}'/> - <s:file key="transectFile" requiredLabel="true" + <s:file key="modelAllTransectFile" requiredLabel="true" label='%{getText("echobase.common.transectFile")}'/> - <s:textarea key="model.importNotes" cols="80" rows="5" + <s:textarea key="modelAll.importNotes" cols="80" rows="5" label='%{getText("echobase.common.importNotes")}'/> </fieldset> @@ -130,27 +131,27 @@ </div> <br/> - <s:select key="model.missionId" requiredLabel="true" + <s:select key="modelVoyage.missionId" requiredLabel="true" label='%{getText("echobase.common.mission")}' list="missions" headerKey="" headerValue=""/> <br/> - <s:hidden key="model.importType" value="COMMON_VOYAGE" label=''/> + <s:hidden key="modelVoyage.importType" value="COMMON_VOYAGE" label=''/> - <s:select key="model.areaOfOperationId" requiredLabel="true" + <s:select key="modelVoyage.areaOfOperationId" requiredLabel="true" label='%{getText("echobase.common.areaOfOperation")}' list="areaOfOperations" headerKey="" headerValue=""/> - <s:textfield key="model.voyageDescription" size="80" requiredLabel="true" + <s:textfield key="modelVoyage.voyageDescription" size="80" requiredLabel="true" label='%{getText("echobase.common.voyageDescription")}'/> - <s:textfield key="model.datum" size="80" requiredLabel="true" + <s:textfield key="modelVoyage.datum" size="80" requiredLabel="true" label='%{getText("echobase.common.datum")}'/> - <s:file key="voyageFile" requiredLabel="true" + <s:file key="modelVoyageVoyageFile" requiredLabel="true" label='%{getText("echobase.common.voyageFile")}'/> - <s:textarea key="model.importNotes" cols="80" rows="5" + <s:textarea key="modelVoyage.importNotes" cols="80" rows="5" label='%{getText("echobase.common.importNotes")}'/> </fieldset> @@ -177,19 +178,19 @@ </div> <br/> - <s:hidden key="model.importType" value="COMMON_TRANSIT" label=''/> + <s:hidden key="modelTransit.importType" value="COMMON_TRANSIT" label=''/> - <s:select key="model.voyageId" requiredLabel="true" + <s:select key="modelTransit.voyageId" requiredLabel="true" label='%{getText("echobase.common.voyage")}' list="voyages" headerKey="" headerValue=""/> - <s:textfield key="model.transitRelatedActivity" size="80" requiredLabel="true" + <s:textfield key="modelTransit.transitRelatedActivity" size="80" requiredLabel="true" label='%{getText("echobase.common.transitRelatedActivity")}'/> - <s:file key="transitFile" requiredLabel="true" + <s:file key="modelTransitTransitFile" requiredLabel="true" label='%{getText("echobase.common.transitFile")}'/> - <s:textarea key="model.importNotes" cols="80" rows="5" + <s:textarea key="modelTransit.importNotes" cols="80" rows="5" label='%{getText("echobase.common.importNotes")}'/> </fieldset> @@ -209,7 +210,7 @@ <s:text name="echobase.legend.importData.configure"/> </legend> - <s:hidden key="model.importType" value="COMMON_TRANSECT" label=''/> + <s:hidden key="modelTransect.importType" value="COMMON_TRANSECT" label=''/> <div class="cleanBoth help"> <s:a href="%{getDocumentation('importData.html', null)}" target="doc"> @@ -218,27 +219,27 @@ </div> <br/> - <s:select key="model.voyageId" requiredLabel="true" + <s:select key="modelTransect.voyageId" requiredLabel="true" label='%{getText("echobase.common.voyage")}' list="voyages" headerKey="" headerValue=""/> - <s:textfield key="model.datum" size="80" requiredLabel="true" + <s:textfield key="modelTransect.datum" size="80" requiredLabel="true" label='%{getText("echobase.common.datum")}'/> - <s:textfield key="model.transectLicence" size="80" requiredLabel="true" + <s:textfield key="modelTransect.transectLicence" size="80" requiredLabel="true" label='%{getText("echobase.common.transectLicence")}'/> - <s:textfield key="model.transectGeospatialVerticalPositive" size="80" + <s:textfield key="modelTransect.transectGeospatialVerticalPositive" size="80" requiredLabel="true" label='%{getText("echobase.common.transectGeospatialVerticalPositive")}'/> - <s:textfield key="model.transectBinUnitsPingAxis" size="80" requiredLabel="true" + <s:textfield key="modelTransect.transectBinUnitsPingAxis" size="80" requiredLabel="true" label='%{getText("echobase.common.transectBinUnitsPingAxis")}'/> - <s:file key="transectFile" requiredLabel="true" + <s:file key="modelTransectTransectFile" requiredLabel="true" label='%{getText("echobase.common.transectFile")}'/> - <s:textarea key="model.importNotes" cols="80" rows="5" + <s:textarea key="modelTransect.importNotes" cols="80" rows="5" label='%{getText("echobase.common.importNotes")}'/> </fieldset> -- 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 echobase. See http://git.codelutin.com/echobase.git commit 87cbc54067724bf12a170d035379a146f5aee88a Author: Tony CHEMIT <chemit@codelutin.com> Date: Tue Jan 12 15:26:38 2016 +0100 Passage sur la dernière version de codelutinpom --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 6e42a10..523a880 100644 --- a/pom.xml +++ b/pom.xml @@ -6,7 +6,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>codelutinpom</artifactId> - <version>5</version> + <version>5-rc-2</version> </parent> <groupId>fr.ifremer</groupId> -- 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 echobase. See http://git.codelutin.com/echobase.git commit 26ae9d229b1411dc26e0a867a2d7a8976de071a7 Merge: 87cbc54 1751642 Author: Tony CHEMIT <chemit@codelutin.com> Date: Tue Jan 12 20:24:28 2016 +0100 Fixes #7900. Merge branch 'feature/7900' into develop .../echobase/ui/EchoBaseApplicationContext.java | 36 ++++++++-- .../importData/AbstractConfigureImport.java | 4 ++ .../actions/importData/ConfigureCommonImport.java | 84 +++++++++++++++++++--- .../echobase/ui/actions/importDb/Configure.java | 4 ++ ...onImport-configureCommon-modeAll-validation.xml | 28 ++++---- ...ort-configureCommon-modeTransect-validation.xml | 14 ++-- ...port-configureCommon-modeTransit-validation.xml | 8 +-- ...mport-configureCommon-modeVoyage-validation.xml | 14 ++-- echobase-ui/src/main/resources/struts.properties | 2 + echobase-ui/src/main/resources/struts.xml | 1 - .../src/main/webapp/WEB-INF/includes/metas.jsp | 28 +++++++- .../jsp/importData/configureAcousticImport.jsp | 1 + .../jsp/importData/configureCatchesImport.jsp | 2 +- .../jsp/importData/configureCommonImport.jsp | 67 ++++++++--------- .../jsp/importData/configureOperationImport.jsp | 7 ++ .../jsp/importData/configureResultsImport.jsp | 2 + .../main/webapp/WEB-INF/jsp/importDb/configure.jsp | 7 ++ 17 files changed, 225 insertions(+), 84 deletions(-) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.
participants (1)
-
codelutin.com scm