Index: lams_tool_daco/src/java/org/lamsfoundation/lams/tool/daco/web/controller/LearningController.java =================================================================== diff -u -r68d56bcf4ea82273d7d3beb10809cb638d9b4e7d -r587db89bd8343613879909637e377091b88e6cf2 --- lams_tool_daco/src/java/org/lamsfoundation/lams/tool/daco/web/controller/LearningController.java (.../LearningController.java) (revision 68d56bcf4ea82273d7d3beb10809cb638d9b4e7d) +++ lams_tool_daco/src/java/org/lamsfoundation/lams/tool/daco/web/controller/LearningController.java (.../LearningController.java) (revision 587db89bd8343613879909637e377091b88e6cf2) @@ -161,7 +161,9 @@ sessionMap.put(AttributeNames.ATTR_MODE, mode); sessionMap.put(DacoConstants.ATTR_REFLECTION_ENTRY, entryText); sessionMap.put(DacoConstants.ATTR_DACO, daco); - sessionMap.put(DacoConstants.ATTR_LEARNING_VIEW, DacoConstants.LEARNING_VIEW_VERTICAL); + String currentView = request.getParameter(DacoConstants.ATTR_LEARNING_VIEW); + sessionMap.put(DacoConstants.ATTR_LEARNING_VIEW, + StringUtils.isBlank(currentView) ? DacoConstants.LEARNING_VIEW_VERTICAL : currentView); List> records = dacoService.getDacoAnswersByUser(dacoUser); sessionMap.put(DacoConstants.ATTR_RECORD_LIST, records); @@ -1000,18 +1002,16 @@ protected String changeView(HttpServletRequest request) { String sessionMapID = WebUtil.readStrParam(request, DacoConstants.ATTR_SESSION_MAP_ID); SessionMap sessionMap = (SessionMap) request.getSession().getAttribute(sessionMapID); - request.setAttribute(DacoConstants.ATTR_SESSION_MAP_ID, sessionMapID); - request.setAttribute(DacoConstants.ATTR_DISPLAYED_RECORD_NUMBER, - WebUtil.readIntParam(request, DacoConstants.ATTR_DISPLAYED_RECORD_NUMBER)); - request.setAttribute(DacoConstants.ATTR_LEARNING_CURRENT_TAB, - WebUtil.readIntParam(request, DacoConstants.ATTR_LEARNING_CURRENT_TAB)); String currentView = (String) sessionMap.get(DacoConstants.ATTR_LEARNING_VIEW); if (DacoConstants.LEARNING_VIEW_HORIZONTAL.equals(currentView)) { - sessionMap.put(DacoConstants.ATTR_LEARNING_VIEW, DacoConstants.LEARNING_VIEW_VERTICAL); + currentView = DacoConstants.LEARNING_VIEW_VERTICAL; } else { - sessionMap.put(DacoConstants.ATTR_LEARNING_VIEW, DacoConstants.LEARNING_VIEW_HORIZONTAL); + currentView = DacoConstants.LEARNING_VIEW_HORIZONTAL; } - return "pages/learning/learning"; + return "redirect:start.do?" + AttributeNames.PARAM_TOOL_SESSION_ID + "=" + + sessionMap.get(AttributeNames.PARAM_TOOL_SESSION_ID) + "&" + AttributeNames.PARAM_MODE + "=" + + sessionMap.get(AttributeNames.PARAM_MODE) + "&" + DacoConstants.ATTR_LEARNING_VIEW + "=" + + currentView; } @RequestMapping("/refreshQuestionSummaries") Index: lams_tool_daco/web/includes/javascript/dacoLearning.js =================================================================== diff -u -r7475d08afc280b5e2e5ddf04e8bf35e3166aaf80 -r587db89bd8343613879909637e377091b88e6cf2 --- lams_tool_daco/web/includes/javascript/dacoLearning.js (.../dacoLearning.js) (revision 7475d08afc280b5e2e5ddf04e8bf35e3166aaf80) +++ lams_tool_daco/web/includes/javascript/dacoLearning.js (.../dacoLearning.js) (revision 587db89bd8343613879909637e377091b88e6cf2) @@ -174,13 +174,7 @@ if ( ! tabID ) { tabID = currentTab; } - var param = {"sessionMapID":sessionMapID,"learningCurrentTab":tabID,"displayedRecordNumber":displayedRecordNumber,"reqID":((new Date()).getTime())}; - $( "#body" ).load( - changeViewUrl, - param, - function() { - doSelectTab(tabID); - }); + document.location.href = changeViewUrl + "?sessionMapID=" + sessionMapID; }