Index: lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/web/actions/LearningAction.java =================================================================== diff -u -r16683c73010c8835568de8a31a2747cabb762910 -ra7d51ba479a52349dec28c1442be6542157ad36d --- lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/web/actions/LearningAction.java (.../LearningAction.java) (revision 16683c73010c8835568de8a31a2747cabb762910) +++ lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/web/actions/LearningAction.java (.../LearningAction.java) (revision a7d51ba479a52349dec28c1442be6542157ad36d) @@ -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 =================================================================== diff -u -red04e2e75728d635ec5c4530bcebe69ab32d9cdb -ra7d51ba479a52349dec28c1442be6542157ad36d --- lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/web/action/LearningAction.java (.../LearningAction.java) (revision ed04e2e75728d635ec5c4530bcebe69ab32d9cdb) +++ lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/web/action/LearningAction.java (.../LearningAction.java) (revision a7d51ba479a52349dec28c1442be6542157ad36d) @@ -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 =================================================================== diff -u -red04e2e75728d635ec5c4530bcebe69ab32d9cdb -ra7d51ba479a52349dec28c1442be6542157ad36d --- lams_tool_larsrc/web/pages/learning/notebook.jsp (.../notebook.jsp) (revision ed04e2e75728d635ec5c4530bcebe69ab32d9cdb) +++ lams_tool_larsrc/web/pages/learning/notebook.jsp (.../notebook.jsp) (revision a7d51ba479a52349dec28c1442be6542157ad36d) @@ -2,7 +2,6 @@ -<%@ include file="/common/taglibs.jsp"%> <fmt:message key="label.learning.title" /> Index: lams_tool_larsrc/web/pages/monitoring/notebook.jsp =================================================================== diff -u -red04e2e75728d635ec5c4530bcebe69ab32d9cdb -ra7d51ba479a52349dec28c1442be6542157ad36d --- lams_tool_larsrc/web/pages/monitoring/notebook.jsp (.../notebook.jsp) (revision ed04e2e75728d635ec5c4530bcebe69ab32d9cdb) +++ lams_tool_larsrc/web/pages/monitoring/notebook.jsp (.../notebook.jsp) (revision a7d51ba479a52349dec28c1442be6542157ad36d) @@ -2,7 +2,6 @@ -<%@ include file="/common/taglibs.jsp"%> <fmt:message key="label.learning.title" />