Index: lams_tool_survey/conf/language/ApplicationResources.properties =================================================================== diff -u -r18b94d13f546c2c8e4339c2f63f67c996a4c9887 -r6407bfaad9bba4cc1ad88be51080fd0c5c206e3e --- lams_tool_survey/conf/language/ApplicationResources.properties (.../ApplicationResources.properties) (revision 18b94d13f546c2c8e4339c2f63f67c996a4c9887) +++ lams_tool_survey/conf/language/ApplicationResources.properties (.../ApplicationResources.properties) (revision 6407bfaad9bba4cc1ad88be51080fd0c5c206e3e) @@ -153,4 +153,5 @@ message.no.reflection.available = No notebook available label.monitoring..button.export.excel=Export Report -error.monitoring.export.excel=Export Survey report failed because of this: {0} \ No newline at end of file +error.monitoring.export.excel=Export Survey report failed because of this: {0} +errors.maxfilesize =The uploaded file has exceeded the maximum file size limit of {0} bytes \ No newline at end of file Index: lams_tool_survey/src/java/org/lamsfoundation/lams/tool/survey/web/action/AuthoringAction.java =================================================================== diff -u -rd2bd2447935a6088d331c661602630854ecc37a5 -r6407bfaad9bba4cc1ad88be51080fd0c5c206e3e --- lams_tool_survey/src/java/org/lamsfoundation/lams/tool/survey/web/action/AuthoringAction.java (.../AuthoringAction.java) (revision d2bd2447935a6088d331c661602630854ecc37a5) +++ lams_tool_survey/src/java/org/lamsfoundation/lams/tool/survey/web/action/AuthoringAction.java (.../AuthoringAction.java) (revision 6407bfaad9bba4cc1ad88be51080fd0c5c206e3e) @@ -72,6 +72,7 @@ import org.lamsfoundation.lams.tool.survey.web.form.QuestionForm; import org.lamsfoundation.lams.tool.survey.web.form.SurveyForm; import org.lamsfoundation.lams.usermanagement.dto.UserDTO; +import org.lamsfoundation.lams.util.FileValidatorUtil; import org.lamsfoundation.lams.util.WebUtil; import org.lamsfoundation.lams.web.session.SessionManager; import org.lamsfoundation.lams.web.util.AttributeNames; @@ -658,7 +659,13 @@ if(file == null || StringUtils.isBlank(file.getFileName())) return mapping.findForward(SurveyConstants.SUCCESS); - + ActionMessages errors = new ActionMessages(); + FileValidatorUtil.validateFileSize(file, true, errors ); + if(!errors.isEmpty()){ + this.saveErrors(request, errors); + return mapping.findForward("success"); + } + ISurveyService service = getSurveyService(); //upload to repository SurveyAttachment att = service.uploadInstructionFile(file, type); @@ -991,6 +998,7 @@ // ActionMessage error = new ActionMessage("error.title.empty"); // errors.add(ActionMessages.GLOBAL_MESSAGE, error); // } + //define it later mode(TEACHER) skip below validation. String modeStr = request.getParameter(AttributeNames.ATTR_MODE); if(StringUtils.equals(modeStr, ToolAccessMode.TEACHER.toString())){