Index: lams_tool_forum/conf/language/lams/ApplicationResources.properties =================================================================== diff -u -r37f37232425f69438bd363e73a66ab7a8ada3345 -r37d7559401aa4ab63c574ec2834b55fe4608b651 --- lams_tool_forum/conf/language/lams/ApplicationResources.properties (.../ApplicationResources.properties) (revision 37f37232425f69438bd363e73a66ab7a8ada3345) +++ lams_tool_forum/conf/language/lams/ApplicationResources.properties (.../ApplicationResources.properties) (revision 37d7559401aa4ab63c574ec2834b55fe4608b651) @@ -74,6 +74,7 @@ title.messageTopic.open =Topic Details title.message.add =Add Message title.message.open =View Message +title.original.message.reply = Original Message title.message.reply =Reply Message title.message.edit =Edit Message title.message.view =Message Board Index: lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/util/ForumConstants.java =================================================================== diff -u -r99c920d6a9d32eb5bf47bcbba06c03b027f5b786 -r37d7559401aa4ab63c574ec2834b55fe4608b651 --- lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/util/ForumConstants.java (.../ForumConstants.java) (revision 99c920d6a9d32eb5bf47bcbba06c03b027f5b786) +++ lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/util/ForumConstants.java (.../ForumConstants.java) (revision 37d7559401aa4ab63c574ec2834b55fe4608b651) @@ -106,6 +106,9 @@ public static final String ATTR_PARENT_TOPIC_ID = "parentID"; + // used when replying message LDEV-1305 + public static final String ATTR_ORIGINAL_MESSAGE = "originalMessage"; + public static final String ATTR_TOPIC_ID = "topicID"; public static final String ATTR_REFLECTION_ON = "reflectOn"; public static final String ATTR_REFLECTION_INSTRUCTION = "reflectInstructions"; Index: lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/web/actions/LearningAction.java =================================================================== diff -u -rd7adf6de8184f09b4a96db90aa072276d6533067 -r37d7559401aa4ab63c574ec2834b55fe4608b651 --- lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/web/actions/LearningAction.java (.../LearningAction.java) (revision d7adf6de8184f09b4a96db90aa072276d6533067) +++ lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/web/actions/LearningAction.java (.../LearningAction.java) (revision 37d7559401aa4ab63c574ec2834b55fe4608b651) @@ -480,7 +480,7 @@ /** - * Dipslay replay topic page. Message form subject will include parent + * Display replay topic page. Message form subject will include parent * topics same subject. * * @param mapping @@ -502,6 +502,11 @@ if (topic != null && topic.getMessage() != null) { String reTitle = topic.getMessage().getSubject(); + + MessageDTO originalMessage = MessageDTO.getMessageDTO(topic.getMessage()); + + request.setAttribute(ForumConstants.ATTR_ORIGINAL_MESSAGE, originalMessage); + // echo back current topic subject to web page if(reTitle != null && !reTitle.trim().startsWith("Re:")) msgForm.getMessage().setSubject("Re:" + reTitle); @@ -510,6 +515,7 @@ } SessionMap sessionMap = getSessionMap(request, msgForm); sessionMap.put(ForumConstants.ATTR_PARENT_TOPIC_ID, parentId); + return mapping.findForward("success"); } @@ -566,6 +572,8 @@ sessionMap.put(ForumConstants.ATTR_NO_MORE_POSTS, Boolean.TRUE); } } + sessionMap.remove(ForumConstants.ATTR_ORIGINAL_MESSAGE); + return mapping.findForward("success"); } Index: lams_tool_forum/web/jsps/learning/reply.jsp =================================================================== diff -u -r48c1a9c4bf2b0e4b4e98135a43ea9e74ca0a1be3 -r37d7559401aa4ab63c574ec2834b55fe4608b651 --- lams_tool_forum/web/jsps/learning/reply.jsp (.../reply.jsp) (revision 48c1a9c4bf2b0e4b4e98135a43ea9e74ca0a1be3) +++ lams_tool_forum/web/jsps/learning/reply.jsp (.../reply.jsp) (revision 37d7559401aa4ab63c574ec2834b55fe4608b651) @@ -12,12 +12,44 @@ ${sessionMap.title} +

+ + +

+ +

+

+ + + + + + + + + + + +
+ + + -
+
+ + +

+ +

- + + <%@ include file="/jsps/learning/message/topicreplyform.jsp"%>