Index: lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/dbupdates/patch20180719.sql =================================================================== diff -u --- lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/dbupdates/patch20180719.sql (revision 0) +++ lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/dbupdates/patch20180719.sql (revision c6dcf8126f0816436ac76a9d5c0784625803f318) @@ -0,0 +1,23 @@ +-- Turn off autocommit, so nothing is committed if there is an error +SET AUTOCOMMIT = 0; +SET FOREIGN_KEY_CHECKS=0; +----------------------Put all sql statements below here------------------------- + +-- LDEV-4440 Change tool access URLs after migration to Spring MVC +UPDATE lams_tool SET + author_url = 'tool/lasbmt11/authoring/authoring.do', + learner_url = 'tool/lasbmt11/learner/learner.do', + learner_preview_url = 'tool/lasbmt11/learning/author.do', + learner_progress_url = 'tool/lasbmt11/learning/teacher.do', + monitor_url = 'tool/lasbmt11/monitoring/monitoring.do', + pedagogical_planner_url = 'tool/lasbmt11/pedagogicalPlanner/initPedagogicalPlannerForm.do' +WHERE tool_signature = 'lasbmt11'; + +UPDATE lams_tool SET tool_version='20180719' WHERE tool_signature='lasbmt11'; + +----------------------Put all sql statements above here------------------------- + +-- If there were no errors, commit and restore autocommit to on +COMMIT; +SET AUTOCOMMIT = 1; +SET FOREIGN_KEY_CHECKS=1; \ No newline at end of file Index: lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/web/controller/AuthoringController.java =================================================================== diff -u -r516c44cd3de0552a5aca39293035dd7326f6d8e3 -rc6dcf8126f0816436ac76a9d5c0784625803f318 --- lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/web/controller/AuthoringController.java (.../AuthoringController.java) (revision 516c44cd3de0552a5aca39293035dd7326f6d8e3) +++ lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/web/controller/AuthoringController.java (.../AuthoringController.java) (revision c6dcf8126f0816436ac76a9d5c0784625803f318) @@ -56,6 +56,7 @@ * @author Steve Ni */ @Controller +@RequestMapping("/authoring") public class AuthoringController { private Logger log = Logger.getLogger(AuthoringController.class); @@ -111,17 +112,17 @@ /** * Update all content for submit tool except online/offline instruction files list. */ - @RequestMapping("authoring/updateContent") + @RequestMapping("/updateContent") public String updateContent(@ModelAttribute AuthoringForm authoringForm, HttpServletRequest request) throws IllegalAccessException, InvocationTargetException, NoSuchMethodException { SessionMap sessionMap = (SessionMap) request.getSession() .getAttribute(authoringForm.getSessionMapID()); ToolAccessMode mode = (ToolAccessMode) sessionMap.get(AttributeNames.PARAM_MODE); - MultiValueMap errorMap = new LinkedMultiValueMap<>(); - errorMap = validate(authoringForm, request); + MultiValueMap errorMap = validate(authoringForm, request); if (!errorMap.isEmpty()) { + request.setAttribute("errorMap", errorMap); return "authoring/authoring"; } Index: lams_tool_sbmt/web/authoring/authoring.jsp =================================================================== diff -u -r0846a8d71b94a193280999c0576aa7512c2fca9d -rc6dcf8126f0816436ac76a9d5c0784625803f318 --- lams_tool_sbmt/web/authoring/authoring.jsp (.../authoring.jsp) (revision 0846a8d71b94a193280999c0576aa7512c2fca9d) +++ lams_tool_sbmt/web/authoring/authoring.jsp (.../authoring.jsp) (revision c6dcf8126f0816436ac76a9d5c0784625803f318) @@ -23,7 +23,7 @@ - +