Index: lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/web/forms/MessageForm.java =================================================================== diff -u -r98901fbfc777fa7907f4643646147c0c0286fa20 -r084f494736aefde70938e39eded1a334f0886e5f --- lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/web/forms/MessageForm.java (.../MessageForm.java) (revision 98901fbfc777fa7907f4643646147c0c0286fa20) +++ lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/web/forms/MessageForm.java (.../MessageForm.java) (revision 084f494736aefde70938e39eded1a334f0886e5f) @@ -34,7 +34,8 @@ import org.lamsfoundation.lams.util.MessageService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Qualifier; -import org.springframework.validation.Errors; +import org.springframework.util.LinkedMultiValueMap; +import org.springframework.util.MultiValueMap; import org.springframework.web.multipart.MultipartFile; /** @@ -73,23 +74,25 @@ * MessageForm validation method from STRUCT interface. * */ - public Errors validate(HttpServletRequest request, Errors errors) { + public MultiValueMap validate(HttpServletRequest request) { + MultiValueMap errorMap = new LinkedMultiValueMap(); + try { if (StringUtils.isBlank(message.getSubject())) { - errors.reject("message.subject", messageService.getMessage("error.subject.required")); + errorMap.add("message.subject", messageService.getMessage("error.subject.required")); } boolean isTestHarness = Boolean.valueOf(request.getParameter("testHarness")); if (!isTestHarness && StringUtils.isBlank(message.getBody())) { - errors.reject("message.body", messageService.getMessage("error.body.required")); + errorMap.add("message.body", messageService.getMessage("error.body.required")); } // validate item size boolean largeFile = true; if (request.getRequestURI().indexOf("/learning/") != -1) { if ((this.getAttachmentFile() != null) && FileUtil.isExecutableFile(this.getAttachmentFile().getOriginalFilename())) { - errors.reject("message.attachments", messageService.getMessage("error.attachment.executable")); + errorMap.add("message.attachments", messageService.getMessage("error.attachment.executable")); } largeFile = false; } @@ -99,7 +102,7 @@ } catch (Exception e) { MessageForm.logger.error("", e); } - return errors; + return errorMap; } // -------------------------get/set methods---------------- Index: lams_tool_forum/web/jsps/authoring/message/create.jsp =================================================================== diff -u -r98901fbfc777fa7907f4643646147c0c0286fa20 -r084f494736aefde70938e39eded1a334f0886e5f --- lams_tool_forum/web/jsps/authoring/message/create.jsp (.../create.jsp) (revision 98901fbfc777fa7907f4643646147c0c0286fa20) +++ lams_tool_forum/web/jsps/authoring/message/create.jsp (.../create.jsp) (revision 084f494736aefde70938e39eded1a334f0886e5f) @@ -25,7 +25,15 @@
- + + + + + + + + +
@@ -35,14 +43,29 @@ - + + + + + + + +
+ + + + + + + +
Index: lams_tool_forum/web/jsps/authoring/message/edit.jsp =================================================================== diff -u -r9f988c0cf9ce45c8812158692f38e74688b96ea4 -r084f494736aefde70938e39eded1a334f0886e5f --- lams_tool_forum/web/jsps/authoring/message/edit.jsp (.../edit.jsp) (revision 9f988c0cf9ce45c8812158692f38e74688b96ea4) +++ lams_tool_forum/web/jsps/authoring/message/edit.jsp (.../edit.jsp) (revision 084f494736aefde70938e39eded1a334f0886e5f) @@ -24,7 +24,15 @@
- + + + + + + + + +
@@ -34,7 +42,14 @@ - + + + + + + + +
Index: lams_tool_forum/web/jsps/learning/message/bodyarea.jsp =================================================================== diff -u -r9f9856694477e89825d83841398b3571c8e90607 -r084f494736aefde70938e39eded1a334f0886e5f --- lams_tool_forum/web/jsps/learning/message/bodyarea.jsp (.../bodyarea.jsp) (revision 9f9856694477e89825d83841398b3571c8e90607) +++ lams_tool_forum/web/jsps/learning/message/bodyarea.jsp (.../bodyarea.jsp) (revision 084f494736aefde70938e39eded1a334f0886e5f) @@ -167,4 +167,11 @@ - + + + + + + + + s Index: lams_tool_forum/web/jsps/learning/message/topiceditform.jsp =================================================================== diff -u -ra34124084b91153f8cbe0720a88be1a8e0ae1e88 -r084f494736aefde70938e39eded1a334f0886e5f --- lams_tool_forum/web/jsps/learning/message/topiceditform.jsp (.../topiceditform.jsp) (revision a34124084b91153f8cbe0720a88be1a8e0ae1e88) +++ lams_tool_forum/web/jsps/learning/message/topiceditform.jsp (.../topiceditform.jsp) (revision 084f494736aefde70938e39eded1a334f0886e5f) @@ -4,6 +4,14 @@   + + + + + + + +
Index: lams_tool_forum/web/jsps/learning/message/topicform.jsp =================================================================== diff -u -r9f9856694477e89825d83841398b3571c8e90607 -r084f494736aefde70938e39eded1a334f0886e5f --- lams_tool_forum/web/jsps/learning/message/topicform.jsp (.../topicform.jsp) (revision 9f9856694477e89825d83841398b3571c8e90607) +++ lams_tool_forum/web/jsps/learning/message/topicform.jsp (.../topicform.jsp) (revision 084f494736aefde70938e39eded1a334f0886e5f) @@ -3,7 +3,14 @@
  - + + + + + + + +
@@ -15,9 +22,14 @@

- -
- + + + + + + + + learning/viewForum.do?toolSessionID=${sessionMap.toolSessionID}&hideReflection=${sessionMap.hideReflection} Index: lams_tool_forum/web/jsps/learning/message/topicreplyform.jsp =================================================================== diff -u -ra34124084b91153f8cbe0720a88be1a8e0ae1e88 -r084f494736aefde70938e39eded1a334f0886e5f --- lams_tool_forum/web/jsps/learning/message/topicreplyform.jsp (.../topicreplyform.jsp) (revision a34124084b91153f8cbe0720a88be1a8e0ae1e88) +++ lams_tool_forum/web/jsps/learning/message/topicreplyform.jsp (.../topicreplyform.jsp) (revision 084f494736aefde70938e39eded1a334f0886e5f) @@ -4,7 +4,14 @@     - + + + + + + + +

@@ -14,7 +21,14 @@
- + + + + + + + +