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.46 -r1.47 --- lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/web/actions/LearningAction.java 31 Aug 2006 06:48:26 -0000 1.46 +++ lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/web/actions/LearningAction.java 1 Sep 2006 06:31:34 -0000 1.47 @@ -214,6 +214,12 @@ if(forum.isDefineLater()){ return mapping.findForward("defineLater"); } + + //set contentInUse flag to true! + forum.setContentInUse(true); + forum.setDefineLater(false); + forumService.updateForum(forum); + //add run offline support if(forum.getRunOffline()){ return mapping.findForward("runOffline"); @@ -223,11 +229,6 @@ List rootTopics = forumService.getRootTopics(sessionId); request.setAttribute(ForumConstants.AUTHORING_TOPICS_LIST, rootTopics); - //set contentInUse flag to true! - forum.setContentInUse(true); - forum.setDefineLater(false); - forumService.updateForum(forum); - return mapping.findForward("success"); } Index: lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/web/action/LearningAction.java =================================================================== RCS file: /usr/local/cvsroot/lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/web/action/LearningAction.java,v diff -u -r1.19 -r1.20 --- lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/web/action/LearningAction.java 31 Aug 2006 06:39:02 -0000 1.19 +++ lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/web/action/LearningAction.java 1 Sep 2006 06:30:16 -0000 1.20 @@ -190,6 +190,12 @@ if(resource.isDefineLater()){ return mapping.findForward("defineLater"); } + + //set contentInUse flag to true! + resource.setContentInUse(true); + resource.setDefineLater(false); + service.saveOrUpdateResource(resource); + //add run offline support if(resource.getRunOffline()){ sessionMap.put(ResourceConstants.PARAM_RUN_OFFLINE, true); @@ -217,12 +223,6 @@ sessionMap.put(ResourceConstants.ATTR_RESOURCE,resource); - //set contentInUse flag to true! - resource.setContentInUse(true); - resource.setDefineLater(false); - service.saveOrUpdateResource(resource); - - return mapping.findForward(ResourceConstants.SUCCESS); } /** Index: lams_tool_larsrc/web/pages/learning/notebook.jsp =================================================================== RCS file: /usr/local/cvsroot/lams_tool_larsrc/web/pages/learning/notebook.jsp,v diff -u -r1.1 -r1.2 --- lams_tool_larsrc/web/pages/learning/notebook.jsp 31 Aug 2006 06:39:01 -0000 1.1 +++ lams_tool_larsrc/web/pages/learning/notebook.jsp 1 Sep 2006 06:30:16 -0000 1.2 @@ -2,7 +2,6 @@ -<%@ include file="/common/taglibs.jsp"%> <fmt:message key="label.learning.title" /> Index: lams_tool_larsrc/web/pages/monitoring/notebook.jsp =================================================================== RCS file: /usr/local/cvsroot/lams_tool_larsrc/web/pages/monitoring/Attic/notebook.jsp,v diff -u -r1.1 -r1.2 --- lams_tool_larsrc/web/pages/monitoring/notebook.jsp 31 Aug 2006 06:39:01 -0000 1.1 +++ lams_tool_larsrc/web/pages/monitoring/notebook.jsp 1 Sep 2006 06:30:16 -0000 1.2 @@ -2,7 +2,6 @@ -<%@ include file="/common/taglibs.jsp"%> <fmt:message key="label.learning.title" />