Index: lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/McMonitoringStarterAction.java =================================================================== diff -u -rc9531327d15636b54f293077ee1cd9f60195381b -rb6388cf4dc60bc441229fd1bfbd66ac0fb8e99c7 --- lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/McMonitoringStarterAction.java (.../McMonitoringStarterAction.java) (revision c9531327d15636b54f293077ee1cd9f60195381b) +++ lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/McMonitoringStarterAction.java (.../McMonitoringStarterAction.java) (revision b6388cf4dc60bc441229fd1bfbd66ac0fb8e99c7) @@ -125,7 +125,6 @@ return (mapping.findForward(ERROR_LIST)); request.getSession().setAttribute(CURRENT_MONITORING_TAB, "summary"); - request.getSession().setAttribute(IS_MONITORED_CONTENT_IN_USE, new Boolean(false).toString()); request.getSession().setAttribute(EDIT_OPTIONS_MODE, new Integer(0)); request.getSession().setAttribute(ACTIVE_MODULE, DEFINE_LATER); @@ -146,18 +145,8 @@ McContent mcContent=mcService.retrieveMc(toolContentId); logger.debug("mcContent:" + mcContent); - boolean isContentInUse=McUtils.isContentInUse(mcContent); - logger.debug("isContentInUse:" + isContentInUse); + - request.getSession().setAttribute(IS_MONITORED_CONTENT_IN_USE, new Boolean(false).toString()); - if (isContentInUse == true) - { - //McUtils.cleanUpSessionAbsolute(request); - logger.debug("monitoring url does not allow editActivity since the content is in use."); - persistError(request,"error.content.inUse"); - request.getSession().setAttribute(IS_MONITORED_CONTENT_IN_USE, new Boolean(true).toString()); - } - /* it is possible that no users has ever logged in for the activity yet*/ int countAllUsers=mcService.getTotalNumberOfUsers(); logger.debug("countAllUsers: " + countAllUsers); @@ -258,6 +247,18 @@ logger.debug("SELECTION_CASE: " + request.getSession().getAttribute(SELECTION_CASE)); logger.debug("LIST_MONITORED_ANSWERS_CONTAINER_DTO: " + request.getSession().getAttribute(LIST_MONITORED_ANSWERS_CONTAINER_DTO)); + boolean isContentInUse=McUtils.isContentInUse(mcContent); + logger.debug("isContentInUse:" + isContentInUse); + + request.getSession().setAttribute(IS_MONITORED_CONTENT_IN_USE, new Boolean(false).toString()); + if (isContentInUse == true) + { + logger.debug("monitoring url does not allow editActivity since the content is in use."); + persistError(request,"error.content.inUse"); + request.getSession().setAttribute(IS_MONITORED_CONTENT_IN_USE, new Boolean(true).toString()); + } + logger.debug("final IS_MONITORED_CONTENT_IN_USE: " + request.getSession().getAttribute(IS_MONITORED_CONTENT_IN_USE)); + return (mapping.findForward(LOAD_MONITORING_CONTENT)); } Index: lams_tool_lamc/web/authoring/AuthoringMaincontent.jsp =================================================================== diff -u -r7c258915bf9d46f8fe8dd192a2b1a77c024d1cad -rb6388cf4dc60bc441229fd1bfbd66ac0fb8e99c7 --- lams_tool_lamc/web/authoring/AuthoringMaincontent.jsp (.../AuthoringMaincontent.jsp) (revision 7c258915bf9d46f8fe8dd192a2b1a77c024d1cad) +++ lams_tool_lamc/web/authoring/AuthoringMaincontent.jsp (.../AuthoringMaincontent.jsp) (revision b6388cf4dc60bc441229fd1bfbd66ac0fb8e99c7) @@ -51,6 +51,7 @@ + <fmt:message key="activity.title" />