Index: lams_tool_sbmt/conf/xdoclet/web-settings.xml =================================================================== RCS file: /usr/local/cvsroot/lams_tool_sbmt/conf/xdoclet/web-settings.xml,v diff -u -r1.2 -r1.3 --- lams_tool_sbmt/conf/xdoclet/web-settings.xml 26 Jul 2005 07:04:42 -0000 1.2 +++ lams_tool_sbmt/conf/xdoclet/web-settings.xml 11 Aug 2005 04:48:38 -0000 1.3 @@ -4,6 +4,9 @@ classpath:/org/lamsfoundation/lams/applicationContext.xml classpath:/org/lamsfoundation/lams/tool/sbmt/submitFilesApplicationContext.xml classpath:/org/lamsfoundation/lams/contentrepository/applicationContext.xml + classpath:/org/lamsfoundation/lams/lesson/lessonApplicationContext.xml + classpath:/org/lamsfoundation/lams/learning/learningApplicationContext.xml + classpath:/org/lamsfoundation/lams/tool/toolApplicationContext.xml Index: lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/submitFilesApplicationContext.xml =================================================================== RCS file: /usr/local/cvsroot/lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/submitFilesApplicationContext.xml,v diff -u -r1.6 -r1.7 --- lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/submitFilesApplicationContext.xml 10 Aug 2005 02:21:22 -0000 1.6 +++ lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/submitFilesApplicationContext.xml 11 Aug 2005 04:48:38 -0000 1.7 @@ -76,7 +76,7 @@ - + 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.8 -r1.9 --- lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/web/AuthoringAction.java 10 Aug 2005 01:39:37 -0000 1.8 +++ lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/web/AuthoringAction.java 11 Aug 2005 04:48:38 -0000 1.9 @@ -10,6 +10,7 @@ import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; +import org.apache.commons.beanutils.PropertyUtils; import org.apache.commons.lang.StringUtils; import org.apache.log4j.Logger; import org.apache.struts.action.ActionForm; @@ -28,6 +29,7 @@ /** * @author Manpreet Minhas + * @author Steve Ni * * @struts.action path="/authoring" * name="SbmtAuthoringForm" @@ -66,7 +68,12 @@ try { SubmitFilesContent persistContent = submitFilesService.getSubmitFilesContent(content.getContentID()); if(content.getContentID().equals(persistContent.getContentID())){ - copyContentSimpleProperty(persistContent,content); + //keep Set type attribute for persist content becuase this update only + //include updating simple properties from web page(i.e. text value, list value, etc) + content.setInstructionFiles(persistContent.getInstructionFiles()); + content.setToolSession(persistContent.getToolSession()); + //copy web page value into persist content, as above, the "Set" type value kept. + PropertyUtils.copyProperties(persistContent,content); submitFilesService.updateSubmitFilesContent(persistContent); }else submitFilesService.addSubmitFilesContent(content); @@ -75,20 +82,6 @@ } return mapping.findForward("success"); } - - private void copyContentSimpleProperty(SubmitFilesContent target, SubmitFilesContent src) { - target.setContentID(src.getContentID()); - target.setContentInUse(src.isContentInUse()); - target.setDefineLater(src.isDefineLater()); - target.setRunOffline(src.isRunOffline()); - target.setInstruction(src.getInstruction()); - target.setOfflineInstruction(src.getOfflineInstruction()); - target.setOnlineInstruction(src.getOnlineInstruction()); - target.setRunOfflineInstruction(src.getRunOfflineInstruction()); - target.setTitle(src.getTitle()); - target.setLockOnFinished(src.isLockOnFinished()); - } - /** * Handle upload online instruction files request. * @param mapping Index: lams_tool_sbmt/web/WEB-INF/web.xml =================================================================== RCS file: /usr/local/cvsroot/lams_tool_sbmt/web/WEB-INF/Attic/web.xml,v diff -u -r1.5 -r1.6 --- lams_tool_sbmt/web/WEB-INF/web.xml 1 Aug 2005 01:27:28 -0000 1.5 +++ lams_tool_sbmt/web/WEB-INF/web.xml 11 Aug 2005 04:48:38 -0000 1.6 @@ -9,6 +9,9 @@ classpath:/org/lamsfoundation/lams/applicationContext.xml classpath:/org/lamsfoundation/lams/tool/sbmt/submitFilesApplicationContext.xml classpath:/org/lamsfoundation/lams/contentrepository/applicationContext.xml + classpath:/org/lamsfoundation/lams/lesson/lessonApplicationContext.xml + classpath:/org/lamsfoundation/lams/learning/learningApplicationContext.xml + classpath:/org/lamsfoundation/lams/tool/toolApplicationContext.xml Index: lams_tool_sbmt/web/authoring/authoring.jsp =================================================================== RCS file: /usr/local/cvsroot/lams_tool_sbmt/web/authoring/authoring.jsp,v diff -u -r1.10 -r1.11 --- lams_tool_sbmt/web/authoring/authoring.jsp 9 Aug 2005 06:06:19 -0000 1.10 +++ lams_tool_sbmt/web/authoring/authoring.jsp 11 Aug 2005 04:48:38 -0000 1.11 @@ -8,9 +8,12 @@ Submit Files + - - + + @@ -29,9 +32,9 @@ - + - +
Basic
@@ -40,9 +43,9 @@ - + - +
Advanced
@@ -51,9 +54,9 @@ - + - +
Instructions
Fisheye: Tag 1.2 refers to a dead (removed) revision in file `lams_tool_sbmt/web/includes/javascript/server.js'. Fisheye: No comparison available. Pass `N' to diff?