Index: lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/util/SbmtWebUtils.java =================================================================== RCS file: /usr/local/cvsroot/lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/util/Attic/SbmtWebUtils.java,v diff -u -r1.5 -r1.6 --- lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/util/SbmtWebUtils.java 17 Sep 2006 06:27:55 -0000 1.5 +++ lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/util/SbmtWebUtils.java 9 Oct 2007 01:26:13 -0000 1.6 @@ -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 =================================================================== RCS file: /usr/local/cvsroot/lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/web/AuthoringAction.java,v diff -u -r1.36 -r1.37 --- lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/web/AuthoringAction.java 13 Dec 2006 06:28:49 -0000 1.36 +++ lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/web/AuthoringAction.java 9 Oct 2007 01:26:13 -0000 1.37 @@ -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 =================================================================== RCS file: /usr/local/cvsroot/lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/web/MonitoringAction.java,v diff -u -r1.37 -r1.38 --- lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/web/MonitoringAction.java 29 Sep 2006 01:57:30 -0000 1.37 +++ lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/web/MonitoringAction.java 9 Oct 2007 01:26:13 -0000 1.38 @@ -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