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>.