Index: lams_tool_notebook/src/java/org/lamsfoundation/lams/tool/notebook/web/actions/AuthoringAction.java
===================================================================
diff -u -rbd376d76233dad7d0a0775762385918fcbb96f4c -rb36a6edc0f97f2bc2ddb50eaed092d607ac2a5b8
--- lams_tool_notebook/src/java/org/lamsfoundation/lams/tool/notebook/web/actions/AuthoringAction.java (.../AuthoringAction.java) (revision bd376d76233dad7d0a0775762385918fcbb96f4c)
+++ lams_tool_notebook/src/java/org/lamsfoundation/lams/tool/notebook/web/actions/AuthoringAction.java (.../AuthoringAction.java) (revision b36a6edc0f97f2bc2ddb50eaed092d607ac2a5b8)
@@ -124,14 +124,6 @@
// TODO NOTE: this causes DB orphans when LD not saved.
}
- // check if content in use is set
- if (notebook.isContentInUse()) {
- // Cannot edit, send to message page.
- request.setAttribute(NotebookConstants.ATTR_MESSAGE, getResources(
- request).getMessage("error.content.locked"));
- return mapping.findForward("message_page");
- }
-
if (mode != null && mode.isTeacher()) {
// Set the defineLater flag so that learners cannot use content
// while we
Index: lams_tool_notebook/web/pages/monitoring/editActivity.jsp
===================================================================
diff -u -r6a8b3b4d658228ef8358b4c59f7a68f27e60f94d -rb36a6edc0f97f2bc2ddb50eaed092d607ac2a5b8
--- lams_tool_notebook/web/pages/monitoring/editActivity.jsp (.../editActivity.jsp) (revision 6a8b3b4d658228ef8358b4c59f7a68f27e60f94d)
+++ lams_tool_notebook/web/pages/monitoring/editActivity.jsp (.../editActivity.jsp) (revision b36a6edc0f97f2bc2ddb50eaed092d607ac2a5b8)
@@ -2,6 +2,12 @@
+
-
-