Index: lams_tool_forum/conf/xdoclet/struts-actions.xml
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_forum/conf/xdoclet/struts-actions.xml,v
diff -u -r1.32 -r1.33
--- lams_tool_forum/conf/xdoclet/struts-actions.xml 9 Jun 2006 07:10:25 -0000 1.32
+++ lams_tool_forum/conf/xdoclet/struts-actions.xml 13 Jun 2006 06:26:23 -0000 1.33
@@ -5,6 +5,7 @@
scope="session"
validate="false"
parameter="defineLater">
+
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.26 -r1.27
--- lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/util/ForumConstants.java 9 Jun 2006 06:16:40 -0000 1.26
+++ lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/util/ForumConstants.java 13 Jun 2006 06:26:23 -0000 1.27
@@ -70,10 +70,6 @@
public static final String MESSAGE_UID = "messageID";
- public static final String MODE = "mode";
- public static final String AUTHOR_MODE = "author_mode";
- public static final String MONITOR_MODE = "monitor_mode";
-
public static final String FINISHEDLOCK = "finishedLock";
// used in monitoring
Index: lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/web/actions/AuthoringAction.java
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/web/actions/AuthoringAction.java,v
diff -u -r1.39 -r1.40
--- lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/web/actions/AuthoringAction.java 9 Jun 2006 07:10:25 -0000 1.39
+++ lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/web/actions/AuthoringAction.java 13 Jun 2006 06:26:24 -0000 1.40
@@ -61,6 +61,7 @@
import org.lamsfoundation.lams.tool.forum.service.IForumService;
import org.lamsfoundation.lams.tool.forum.util.DateComparator;
import org.lamsfoundation.lams.tool.forum.util.ForumConstants;
+import org.lamsfoundation.lams.tool.forum.util.ForumWebUtils;
import org.lamsfoundation.lams.tool.forum.web.forms.ForumForm;
import org.lamsfoundation.lams.tool.forum.web.forms.MessageForm;
import org.lamsfoundation.lams.usermanagement.dto.UserDTO;
@@ -90,7 +91,23 @@
// ***************** Monitoring define later screen ********************
if (param.equals("defineLater")){
+ //update define later flag to true
request.getSession().setAttribute(AttributeNames.ATTR_MODE,ToolAccessMode.TEACHER);
+ forumService = getForumManager();
+ Long contentId = new Long(WebUtil.readLongParam(request,AttributeNames.PARAM_TOOL_CONTENT_ID));
+ Forum forum = forumService.getForumByContentId(contentId);
+
+ boolean isForumEditable = ForumWebUtils.isForumEditable(forum);
+ if(!isForumEditable){
+ request.setAttribute(ForumConstants.PAGE_EDITABLE, new Boolean(isForumEditable));
+ return mapping.findForward("forbidden");
+ }
+
+ if(!forum.isContentInUse()){
+ forum.setDefineLater(true);
+ forumService.updateForum(forum);
+ }
+
return initPage(mapping, form, request, response);
}
if (param.equals("updateContent")) {
@@ -154,6 +171,7 @@
protected ActionForward initPage(ActionMapping mapping, ActionForm form,
HttpServletRequest request, HttpServletResponse response) {
+ ToolAccessMode mode = (ToolAccessMode) request.getSession().getAttribute(AttributeNames.ATTR_MODE);
Long contentId = new Long(WebUtil.readLongParam(request,AttributeNames.PARAM_TOOL_CONTENT_ID));
ForumForm forumForm = (ForumForm)form;
//get back the topic list and display them on page
@@ -177,8 +195,9 @@
topics = new ArrayList(map.values());
}else
topics = null;
- }else
+ }else{
topics = forumService.getAuthoredTopics(forum.getUid());
+ }
//initialize attachmentList
List attachmentList = getAttachmentList(request);
attachmentList.addAll(forum.getAttachments());
@@ -250,6 +269,7 @@
// if it is Teacher, then just update basic tab content (definelater)
forumPO.setInstructions(forum.getInstructions());
forumPO.setTitle(forum.getTitle());
+ forumPO.setDefineLater(false);
}
}
forumPO.setCreatedBy(forumUser);
Index: lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/web/actions/ClearSessionAction.java
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/web/actions/ClearSessionAction.java,v
diff -u -r1.1 -r1.2
--- lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/web/actions/ClearSessionAction.java 12 May 2006 05:14:22 -0000 1.1
+++ lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/web/actions/ClearSessionAction.java 13 Jun 2006 06:26:24 -0000 1.2
@@ -29,6 +29,7 @@
import org.lamsfoundation.lams.authoring.web.LamsAuthoringFinishAction;
import org.lamsfoundation.lams.tool.ToolAccessMode;
import org.lamsfoundation.lams.tool.forum.util.ForumConstants;
+import org.lamsfoundation.lams.web.util.AttributeNames;
/**
* This class give a chance to clear HttpSession when user save/close authoring page.
@@ -41,7 +42,7 @@
@Override
public void clearSession(HttpSession session, ToolAccessMode mode) {
if(mode.isAuthor()){
- session.removeAttribute(ForumConstants.MODE);
+ session.removeAttribute(AttributeNames.ATTR_MODE);
session.removeAttribute(ForumConstants.AUTHORING_TOPICS_LIST);
session.removeAttribute(ForumConstants.ATTACHMENT_LIST);
session.removeAttribute(ForumConstants.DELETED_ATTACHMENT_LIST);
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.31 -r1.32
--- lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/web/actions/LearningAction.java 9 Jun 2006 06:16:39 -0000 1.31
+++ lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/web/actions/LearningAction.java 13 Jun 2006 06:26:23 -0000 1.32
@@ -470,7 +470,7 @@
MessageForm messageForm = (MessageForm) form;
Message message = messageForm.getMessage();
- boolean makeAuditEntry = ToolAccessMode.TEACHER.equals((ToolAccessMode) request.getSession().getAttribute(ForumConstants.MODE));
+ boolean makeAuditEntry = ToolAccessMode.TEACHER.equals((ToolAccessMode) request.getSession().getAttribute(AttributeNames.ATTR_MODE));
String oldMessageString = null;
// get PO from database and sync with Form
@@ -571,7 +571,7 @@
forumService = getForumManager();
forumService.deleteFromRepository(uuID, versionID);
- boolean makeAuditEntry = ToolAccessMode.TEACHER.equals((ToolAccessMode) request.getSession().getAttribute(ForumConstants.MODE));
+ boolean makeAuditEntry = ToolAccessMode.TEACHER.equals((ToolAccessMode) request.getSession().getAttribute(AttributeNames.ATTR_MODE));
String oldMessageString = null;
// get value from HttpSession
Index: lams_tool_forum/web/WEB-INF/struts-config.xml
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_forum/web/WEB-INF/Attic/struts-config.xml,v
diff -u -r1.36 -r1.37
--- lams_tool_forum/web/WEB-INF/struts-config.xml 9 Jun 2006 07:10:25 -0000 1.36
+++ lams_tool_forum/web/WEB-INF/struts-config.xml 13 Jun 2006 06:26:24 -0000 1.37
@@ -54,6 +54,7 @@
scope="session"
validate="false"
parameter="defineLater">
+
Index: lams_tool_forum/web/WEB-INF/struts/tiles-defs.xml
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_forum/web/WEB-INF/struts/Attic/tiles-defs.xml,v
diff -u -r1.25 -r1.26
--- lams_tool_forum/web/WEB-INF/struts/tiles-defs.xml 9 Jun 2006 06:16:40 -0000 1.25
+++ lams_tool_forum/web/WEB-INF/struts/tiles-defs.xml 13 Jun 2006 06:26:23 -0000 1.26
@@ -102,6 +102,11 @@
+
+
+
+
+
Index: lams_tool_forum/web/jsps/authoring/definelater.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_forum/web/jsps/authoring/definelater.jsp,v
diff -u -r1.1 -r1.2
--- lams_tool_forum/web/jsps/authoring/definelater.jsp 8 Jun 2006 07:37:32 -0000 1.1
+++ lams_tool_forum/web/jsps/authoring/definelater.jsp 13 Jun 2006 06:26:23 -0000 1.2
@@ -1,4 +1,4 @@
-<%@ include file="/includes/taglibs.jsp"%>
+<%@ include file="/common/taglibs.jsp"%>
<%@ page import="org.lamsfoundation.lams.tool.forum.util.ForumConstants"%>
<%@ page import="java.util.HashSet"%>
<%@ page import="java.util.Set"%>
Index: lams_tool_forum/web/jsps/authoring/definelaterforbid.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_forum/web/jsps/authoring/definelaterforbid.jsp,v
diff -u
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ lams_tool_forum/web/jsps/authoring/definelaterforbid.jsp 13 Jun 2006 06:26:23 -0000 1.1
@@ -0,0 +1,4 @@
+<%@ include file="/common/taglibs.jsp"%>
+
+
+