Index: lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/util/SbmtWebUtils.java =================================================================== diff -u -r08950e1090443c3423a3d1c587416a2fccd8bbdf -r533a6ac1aac078a12682ed733e57c03f1e59e626 --- lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/util/SbmtWebUtils.java (.../SbmtWebUtils.java) (revision 08950e1090443c3423a3d1c587416a2fccd8bbdf) +++ lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/util/SbmtWebUtils.java (.../SbmtWebUtils.java) (revision 533a6ac1aac078a12682ed733e57c03f1e59e626) @@ -36,19 +36,6 @@ */ public class SbmtWebUtils { - public static boolean isSbmtEditable(SubmitFilesContent submitContent) { - if ( (submitContent.isDefineLater() == true) && (submitContent.isContentInUse()==true) ) - { - throw new SubmitFilesException("An exception has occurred: There is a bug in this tool, conflicting flags are set"); - //return false; - } - else if ( (submitContent.isDefineLater() == true) && (submitContent.isContentInUse() == false)) - return true; - else if ( (submitContent.isDefineLater() == false) && (submitContent.isContentInUse() == false)) - return true; - else // (content.isContentInUse()==true && content.isDefineLater() == false) - return false; - } + // We'll leave this here for future use - } Index: lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/web/AuthoringAction.java =================================================================== diff -u -r6ab1be78f747daf9e82788ceee85ccce03d0ab9d -r533a6ac1aac078a12682ed733e57c03f1e59e626 --- lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/web/AuthoringAction.java (.../AuthoringAction.java) (revision 6ab1be78f747daf9e82788ceee85ccce03d0ab9d) +++ lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/web/AuthoringAction.java (.../AuthoringAction.java) (revision 533a6ac1aac078a12682ed733e57c03f1e59e626) @@ -117,16 +117,10 @@ SubmitFilesContent persistContent = submitFilesService.getSubmitFilesContent(contentID); if(mode.isTeacher()){ - boolean isForumEditable = SbmtWebUtils.isSbmtEditable(persistContent); - if(!isForumEditable){ - request.setAttribute(SbmtConstants.PAGE_EDITABLE, new Boolean(isForumEditable)); - return mapping.findForward("forbidden"); - } + + persistContent.setDefineLater(true); + submitFilesService.saveOrUpdateContent(persistContent); - if(!persistContent.isContentInUse()){ - persistContent.setDefineLater(true); - submitFilesService.saveOrUpdateContent(persistContent); - } } //if this content does not exist(empty without id), create a content by default content record. Index: lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/web/MonitoringAction.java =================================================================== diff -u -rf50903db417c658ce7f49580001c058e012b7f13 -r533a6ac1aac078a12682ed733e57c03f1e59e626 --- lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/web/MonitoringAction.java (.../MonitoringAction.java) (revision f50903db417c658ce7f49580001c058e012b7f13) +++ lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/web/MonitoringAction.java (.../MonitoringAction.java) (revision 533a6ac1aac078a12682ed733e57c03f1e59e626) @@ -135,12 +135,12 @@ AuthoringDTO authorDto = new AuthoringDTO(persistContent); request.setAttribute(SbmtConstants.AUTHORING_DTO,authorDto); - request.setAttribute(SbmtConstants.PAGE_EDITABLE, new Boolean(SbmtWebUtils.isSbmtEditable(persistContent))); + request.setAttribute(SbmtConstants.PAGE_EDITABLE, persistContent.isContentInUse()); return mapping.findForward("success"); } /** - * AJAX call to refresh statisitic page. + * AJAX call to refresh statistic page. * @param mapping * @param form * @param request