Index: lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/util/ResourceWebUtils.java =================================================================== RCS file: /usr/local/cvsroot/lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/util/ResourceWebUtils.java,v diff -u -r1.2 -r1.3 --- lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/util/ResourceWebUtils.java 17 Sep 2006 06:25:36 -0000 1.2 +++ lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/util/ResourceWebUtils.java 9 Oct 2007 03:37:11 -0000 1.3 @@ -37,19 +37,5 @@ */ public class ResourceWebUtils { - public static boolean isResourceEditable(Resource resource) { - if ( (resource.isDefineLater() == true) && (resource.isContentInUse()==true) ) - { - // throw new ResourceApplicationException("An exception has occurred: There is a bug in this tool, conflicting flags are set"); - MonitoringAction.log.error("An exception has occurred: There is a bug in this tool, conflicting flags are set"); - return false; - } - else if ( (resource.isDefineLater() == true) && (resource.isContentInUse() == false)) - return true; - else if ( (resource.isDefineLater() == false) && (resource.isContentInUse() == false)) - return true; - else // (content.isContentInUse()==true && content.isDefineLater() == false) - return false; - } - +// We leave this blank for future use } Index: lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/web/action/AuthoringAction.java =================================================================== RCS file: /usr/local/cvsroot/lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/web/action/AuthoringAction.java,v diff -u -r1.46 -r1.47 --- lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/web/action/AuthoringAction.java 14 Dec 2006 03:42:17 -0000 1.46 +++ lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/web/action/AuthoringAction.java 9 Oct 2007 03:37:11 -0000 1.47 @@ -113,17 +113,9 @@ IResourceService service = getResourceService(); Resource resource = service.getResourceByContentId(contentId); - boolean isEditable = ResourceWebUtils.isResourceEditable(resource); - if(!isEditable){ - request.setAttribute(ResourceConstants.PAGE_EDITABLE, new Boolean(isEditable)); - return mapping.findForward("forbidden"); - } + resource.setDefineLater(true); + service.saveOrUpdateResource(resource); - if(!resource.isContentInUse()){ - resource.setDefineLater(true); - service.saveOrUpdateResource(resource); - } - request.setAttribute(AttributeNames.ATTR_MODE,ToolAccessMode.TEACHER.toString()); return start(mapping, form, request, response); } Index: lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/web/action/MonitoringAction.java =================================================================== RCS file: /usr/local/cvsroot/lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/web/action/MonitoringAction.java,v diff -u -r1.13 -r1.14 --- lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/web/action/MonitoringAction.java 29 Sep 2006 01:57:00 -0000 1.13 +++ lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/web/action/MonitoringAction.java 9 Oct 2007 03:37:11 -0000 1.14 @@ -156,7 +156,7 @@ //cache into sessionMap sessionMap.put(ResourceConstants.ATTR_SUMMARY_LIST, groupList); - sessionMap.put(ResourceConstants.PAGE_EDITABLE, new Boolean(ResourceWebUtils.isResourceEditable(resource))); + sessionMap.put(ResourceConstants.PAGE_EDITABLE, resource.isContentInUse()); sessionMap.put(ResourceConstants.ATTR_RESOURCE, resource); sessionMap.put(ResourceConstants.ATTR_TOOL_CONTENT_ID, contentId); sessionMap.put(ResourceConstants.ATTR_REFLECT_LIST, relectList);