Index: lams_tool_forum/conf/language/lams/ApplicationResources.properties =================================================================== RCS file: /usr/local/cvsroot/lams_tool_forum/conf/language/lams/ApplicationResources.properties,v diff -u -r1.1 -r1.2 --- lams_tool_forum/conf/language/lams/ApplicationResources.properties 17 Feb 2007 12:07:21 -0000 1.1 +++ lams_tool_forum/conf/language/lams/ApplicationResources.properties 3 Sep 2007 08:04:50 -0000 1.2 @@ -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 =================================================================== RCS file: /usr/local/cvsroot/lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/util/ForumConstants.java,v diff -u -r1.45 -r1.46 --- lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/util/ForumConstants.java 20 Nov 2006 05:29:11 -0000 1.45 +++ lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/util/ForumConstants.java 3 Sep 2007 08:03:58 -0000 1.46 @@ -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 =================================================================== RCS file: /usr/local/cvsroot/lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/web/actions/LearningAction.java,v diff -u -r1.55 -r1.56 --- lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/web/actions/LearningAction.java 24 May 2007 00:13:31 -0000 1.55 +++ lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/web/actions/LearningAction.java 3 Sep 2007 08:02:42 -0000 1.56 @@ -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 =================================================================== RCS file: /usr/local/cvsroot/lams_tool_forum/web/jsps/learning/reply.jsp,v diff -u -r1.8 -r1.9 --- lams_tool_forum/web/jsps/learning/reply.jsp 13 Feb 2007 01:05:43 -0000 1.8 +++ lams_tool_forum/web/jsps/learning/reply.jsp 3 Sep 2007 08:02:00 -0000 1.9 @@ -12,12 +12,44 @@ ${sessionMap.title} +
+