Index: lams_build/lib/lams/lams.jar =================================================================== RCS file: /usr/local/cvsroot/lams_build/lib/lams/lams.jar,v diff -u -r1.420.2.118 -r1.420.2.119 Binary files differ Index: lams_common/src/java/org/lamsfoundation/lams/util/WebUtil.java =================================================================== RCS file: /usr/local/cvsroot/lams_common/src/java/org/lamsfoundation/lams/util/WebUtil.java,v diff -u -r1.29.2.3 -r1.29.2.4 --- lams_common/src/java/org/lamsfoundation/lams/util/WebUtil.java 29 Nov 2016 09:28:36 -0000 1.29.2.3 +++ lams_common/src/java/org/lamsfoundation/lams/util/WebUtil.java 30 Mar 2017 18:30:51 -0000 1.29.2.4 @@ -22,6 +22,7 @@ import org.lamsfoundation.lams.tool.ToolAccessMode; import org.lamsfoundation.lams.tool.exception.ToolException; import org.lamsfoundation.lams.usermanagement.User; +import org.lamsfoundation.lams.web.util.AttributeNames; /** * helper methods useful for servlets @@ -353,7 +354,6 @@ * supports all three ways of looking at a learner screen. * * @param request - * @param param_mode * @return the ToolAccessMode object */ public static ToolAccessMode getToolAccessMode(String modeValue) { @@ -368,6 +368,24 @@ } throw new IllegalArgumentException("[" + modeValue + "] is not a legal mode" + "in LAMS"); } + + /** + * Get ToolAccessMode from HttpRequest parameters. Default value is AUTHOR mode. + * + * @param request + * @return + */ + public static ToolAccessMode readToolAccessModeAuthorDefaulted(HttpServletRequest request) { + String modeStr = request.getParameter(AttributeNames.ATTR_MODE); + + ToolAccessMode mode; + if (StringUtils.equalsIgnoreCase(modeStr, ToolAccessMode.TEACHER.toString())) { + mode = ToolAccessMode.TEACHER; + } else { + mode = ToolAccessMode.AUTHOR; + } + return mode; + } /** *

Index: lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/web/action/AuthoringAction.java =================================================================== RCS file: /usr/local/cvsroot/lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/web/action/AuthoringAction.java,v diff -u -r1.36.2.12 -r1.36.2.13 --- lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/web/action/AuthoringAction.java 17 Mar 2017 18:03:02 -0000 1.36.2.12 +++ lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/web/action/AuthoringAction.java 30 Mar 2017 18:29:57 -0000 1.36.2.13 @@ -107,13 +107,8 @@ String param = mapping.getParameter(); // -----------------------Assessment Author functions --------------------------- if (param.equals("start")) { - ToolAccessMode mode = getAccessMode(request); - // teacher mode "check for new" button enter. - if (mode != null) { - request.setAttribute(AttributeNames.ATTR_MODE, mode.toString()); - } else { - request.setAttribute(AttributeNames.ATTR_MODE, ToolAccessMode.AUTHOR.toString()); - } + ToolAccessMode mode = WebUtil.readToolAccessModeAuthorDefaulted(request); + request.setAttribute(AttributeNames.ATTR_MODE, mode.toString()); return start(mapping, form, request, response); } if (param.equals("definelater")) { @@ -298,7 +293,7 @@ throw new ServletException(e); } - ToolAccessMode mode = getAccessMode(request); + ToolAccessMode mode = WebUtil.readToolAccessModeAuthorDefaulted(request); request.setAttribute(AttributeNames.ATTR_MODE, mode.toString()); return mapping.findForward(AssessmentConstants.SUCCESS); @@ -323,7 +318,7 @@ SessionMap sessionMap = (SessionMap) request.getSession() .getAttribute(assessmentForm.getSessionMapID()); - ToolAccessMode mode = getAccessMode(request); + ToolAccessMode mode = WebUtil.readToolAccessModeAuthorDefaulted(request); Assessment assessment = assessmentForm.getAssessment(); IAssessmentService service = getAssessmentService(); @@ -1890,23 +1885,6 @@ } - /** - * Get ToolAccessMode from HttpRequest parameters. Default value is AUTHOR mode. - * - * @param request - * @return - */ - private ToolAccessMode getAccessMode(HttpServletRequest request) { - ToolAccessMode mode; - String modeStr = request.getParameter(AttributeNames.ATTR_MODE); - if (StringUtils.equalsIgnoreCase(modeStr, ToolAccessMode.TEACHER.toString())) { - mode = ToolAccessMode.TEACHER; - } else { - mode = ToolAccessMode.AUTHOR; - } - return mode; - } - private Set updateQuestionReferencesGrades(HttpServletRequest request, SessionMap sessionMap, boolean isFormSubmit) { Map paramMap = splitRequestParameter(request, Index: lams_tool_bbb/src/java/org/lamsfoundation/lams/tool/bbb/web/actions/AuthoringAction.java =================================================================== RCS file: /usr/local/cvsroot/lams_tool_bbb/src/java/org/lamsfoundation/lams/tool/bbb/web/actions/AuthoringAction.java,v diff -u -r1.2.2.3 -r1.2.2.4 --- lams_tool_bbb/src/java/org/lamsfoundation/lams/tool/bbb/web/actions/AuthoringAction.java 11 May 2016 07:14:49 -0000 1.2.2.3 +++ lams_tool_bbb/src/java/org/lamsfoundation/lams/tool/bbb/web/actions/AuthoringAction.java 30 Mar 2017 18:30:49 -0000 1.2.2.4 @@ -88,7 +88,7 @@ String contentFolderID = WebUtil.readStrParam(request, AttributeNames.PARAM_CONTENT_FOLDER_ID); - ToolAccessMode mode = WebUtil.readToolAccessModeParam(request, AttributeNames.PARAM_MODE, true); + ToolAccessMode mode = WebUtil.readToolAccessModeAuthorDefaulted(request); // retrieving Bbb with given toolContentID Bbb bbb = bbbService.getBbbByContentId(toolContentID); @@ -99,7 +99,7 @@ // TODO NOTE: this causes DB orphans when LD not saved. } - if (mode != null && mode.isTeacher()) { + if (mode.isTeacher()) { // Set the defineLater flag so that learners cannot use content // while we are editing. This flag is released when updateContent is // called. @@ -112,7 +112,7 @@ copyProperties(authForm, bbb); // Set up sessionMap - SessionMap map = createSessionMap(bbb, getAccessMode(request), contentFolderID, toolContentID); + SessionMap map = createSessionMap(bbb, mode, contentFolderID, toolContentID); authForm.setSessionMapID(map.getSessionID()); // add the sessionMap to HTTPSession. @@ -211,23 +211,6 @@ } /** - * Get ToolAccessMode from HttpRequest parameters. Default value is AUTHOR mode. - * - * @param request - * @return - */ - private ToolAccessMode getAccessMode(HttpServletRequest request) { - ToolAccessMode mode; - String modeStr = request.getParameter(AttributeNames.ATTR_MODE); - if (StringUtils.equalsIgnoreCase(modeStr, ToolAccessMode.TEACHER.toString())) { - mode = ToolAccessMode.TEACHER; - } else { - mode = ToolAccessMode.AUTHOR; - } - return mode; - } - - /** * Retrieve the SessionMap from the HttpSession. * * @param request Index: lams_tool_chat/src/java/org/lamsfoundation/lams/tool/chat/web/actions/AuthoringAction.java =================================================================== RCS file: /usr/local/cvsroot/lams_tool_chat/src/java/org/lamsfoundation/lams/tool/chat/web/actions/AuthoringAction.java,v diff -u -r1.30.2.3 -r1.30.2.4 --- lams_tool_chat/src/java/org/lamsfoundation/lams/tool/chat/web/actions/AuthoringAction.java 11 May 2016 07:14:21 -0000 1.30.2.3 +++ lams_tool_chat/src/java/org/lamsfoundation/lams/tool/chat/web/actions/AuthoringAction.java 30 Mar 2017 18:30:34 -0000 1.30.2.4 @@ -87,7 +87,7 @@ String contentFolderID = WebUtil.readStrParam(request, AttributeNames.PARAM_CONTENT_FOLDER_ID); - ToolAccessMode mode = WebUtil.readToolAccessModeParam(request, "mode", true); + ToolAccessMode mode = WebUtil.readToolAccessModeAuthorDefaulted(request); // set up chatService if (chatService == null) { @@ -103,7 +103,7 @@ // TODO NOTE: this causes DB orphans when LD not saved. } - if (mode != null && mode.isTeacher()) { + if (mode.isTeacher()) { // Set the defineLater flag so that learners cannot use content // while we // are editing. This flag is released when updateContent is called. @@ -116,7 +116,7 @@ updateAuthForm(authForm, chat); // Set up sessionMap - SessionMap map = createSessionMap(chat, getAccessMode(request), contentFolderID, toolContentID); + SessionMap map = createSessionMap(chat, mode, contentFolderID, toolContentID); authForm.setSessionMapID(map.getSessionID()); // add the sessionMap to HTTPSession. @@ -242,23 +242,6 @@ } /** - * Get ToolAccessMode from HttpRequest parameters. Default value is AUTHOR mode. - * - * @param request - * @return - */ - private ToolAccessMode getAccessMode(HttpServletRequest request) { - ToolAccessMode mode; - String modeStr = request.getParameter(AttributeNames.ATTR_MODE); - if (StringUtils.equalsIgnoreCase(modeStr, ToolAccessMode.TEACHER.toString())) { - mode = ToolAccessMode.TEACHER; - } else { - mode = ToolAccessMode.AUTHOR; - } - return mode; - } - - /** * Retrieve the SessionMap from the HttpSession. * * @param request Index: lams_tool_daco/src/java/org/lamsfoundation/lams/tool/daco/web/action/AuthoringAction.java =================================================================== RCS file: /usr/local/cvsroot/lams_tool_daco/src/java/org/lamsfoundation/lams/tool/daco/web/action/AuthoringAction.java,v diff -u -r1.9.2.3 -r1.9.2.4 --- lams_tool_daco/src/java/org/lamsfoundation/lams/tool/daco/web/action/AuthoringAction.java 24 Mar 2017 16:36:40 -0000 1.9.2.3 +++ lams_tool_daco/src/java/org/lamsfoundation/lams/tool/daco/web/action/AuthoringAction.java 30 Mar 2017 18:30:55 -0000 1.9.2.4 @@ -88,13 +88,8 @@ // -----------------------Daco Author function // --------------------------- if (param.equals("start")) { - ToolAccessMode mode = getAccessMode(request); - // teacher mode "check for new" button enter. - if (mode != null) { - request.setAttribute(AttributeNames.ATTR_MODE, mode.toString()); - } else { - request.setAttribute(AttributeNames.ATTR_MODE, ToolAccessMode.AUTHOR.toString()); - } + ToolAccessMode mode = WebUtil.readToolAccessModeAuthorDefaulted(request); + request.setAttribute(AttributeNames.ATTR_MODE, mode.toString()); return start(mapping, form, request); } if (param.equals("definelater")) { @@ -291,23 +286,6 @@ } /** - * Get ToolAccessMode from HttpRequest parameters. Default value is AUTHOR mode. - * - * @param request - * @return - */ - protected ToolAccessMode getAccessMode(HttpServletRequest request) { - ToolAccessMode mode; - String modeStr = request.getParameter(AttributeNames.ATTR_MODE); - if (StringUtils.equalsIgnoreCase(modeStr, ToolAccessMode.TEACHER.toString())) { - mode = ToolAccessMode.TEACHER; - } else { - mode = ToolAccessMode.AUTHOR; - } - return mode; - } - - /** * Get answer options from HttpRequest * * @param request @@ -438,7 +416,7 @@ throw new ServletException(e); } - ToolAccessMode mode = getAccessMode(request); + ToolAccessMode mode = WebUtil.readToolAccessModeAuthorDefaulted(request); request.setAttribute(AttributeNames.ATTR_MODE, mode.toString()); return mapping.findForward(DacoConstants.SUCCESS); @@ -763,7 +741,7 @@ // get back sessionMAP SessionMap sessionMap = (SessionMap) request.getSession().getAttribute(dacoForm.getSessionMapID()); - ToolAccessMode toolAccessMode = getAccessMode(request); + ToolAccessMode toolAccessMode = WebUtil.readToolAccessModeAuthorDefaulted(request); request.setAttribute(AttributeNames.ATTR_MODE, toolAccessMode.toString()); ActionMessages errors = validateDacoForm(dacoForm, mapping, request); Index: lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/util/ForumWebUtils.java =================================================================== RCS file: /usr/local/cvsroot/lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/util/ForumWebUtils.java,v diff -u -r1.4.14.2 -r1.4.14.3 --- lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/util/ForumWebUtils.java 11 May 2016 07:14:58 -0000 1.4.14.2 +++ lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/util/ForumWebUtils.java 30 Mar 2017 18:30:37 -0000 1.4.14.3 @@ -54,24 +54,4 @@ } } - /** - * Get ToolAccessMode from HttpRequest parameters. Default value is AUTHOR mode. - * - * @param request - * @return - */ - public static ToolAccessMode getAccessMode(HttpServletRequest request) { - ToolAccessMode mode = null; - String modeStr = request.getParameter(AttributeNames.ATTR_MODE); - if (StringUtils.equalsIgnoreCase(modeStr, ToolAccessMode.TEACHER.toString())) { - mode = ToolAccessMode.TEACHER; - } else if (StringUtils.equalsIgnoreCase(modeStr, ToolAccessMode.AUTHOR.toString())) { - mode = ToolAccessMode.AUTHOR; - } else if (StringUtils.equalsIgnoreCase(modeStr, ToolAccessMode.LEARNER.toString())) { - mode = ToolAccessMode.LEARNER; - } - - return mode; - } - } Index: lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/web/actions/AuthoringAction.java =================================================================== RCS file: /usr/local/cvsroot/lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/web/actions/AuthoringAction.java,v diff -u -r1.82.2.10 -r1.82.2.11 --- lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/web/actions/AuthoringAction.java 27 Mar 2017 17:28:17 -0000 1.82.2.10 +++ lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/web/actions/AuthoringAction.java 30 Mar 2017 18:30:38 -0000 1.82.2.11 @@ -252,7 +252,7 @@ conditionSet.clear(); conditionSet.addAll(forum.getConditions()); - ToolAccessMode mode = getAccessMode(request); + ToolAccessMode mode = WebUtil.readToolAccessModeAuthorDefaulted(request); request.setAttribute(AttributeNames.ATTR_MODE, mode.toString()); return mapping.findForward("success"); @@ -281,7 +281,7 @@ HttpServletResponse response) throws IllegalAccessException, InvocationTargetException, NoSuchMethodException { - ToolAccessMode mode = getAccessMode(request); + ToolAccessMode mode = WebUtil.readToolAccessModeAuthorDefaulted(request); request.setAttribute(AttributeNames.ATTR_MODE, mode.toString()); ForumForm forumForm = (ForumForm) form; @@ -782,23 +782,6 @@ } /** - * Get ToolAccessMode from HttpRequest parameters. Default value is AUTHOR mode. - * - * @param request - * @return - */ - private ToolAccessMode getAccessMode(HttpServletRequest request) { - ToolAccessMode mode; - String modeStr = request.getParameter(AttributeNames.ATTR_MODE); - if (StringUtils.equalsIgnoreCase(modeStr, ToolAccessMode.TEACHER.toString())) { - mode = ToolAccessMode.TEACHER; - } else { - mode = ToolAccessMode.AUTHOR; - } - return mode; - } - - /** * Forum validation method from STRUCT interface. * */ Index: lams_tool_gmap/src/java/org/lamsfoundation/lams/tool/gmap/web/actions/AuthoringAction.java =================================================================== RCS file: /usr/local/cvsroot/lams_tool_gmap/src/java/org/lamsfoundation/lams/tool/gmap/web/actions/AuthoringAction.java,v diff -u -r1.14.2.3 -r1.14.2.4 --- lams_tool_gmap/src/java/org/lamsfoundation/lams/tool/gmap/web/actions/AuthoringAction.java 11 May 2016 07:14:34 -0000 1.14.2.3 +++ lams_tool_gmap/src/java/org/lamsfoundation/lams/tool/gmap/web/actions/AuthoringAction.java 30 Mar 2017 18:30:39 -0000 1.14.2.4 @@ -32,7 +32,6 @@ import javax.servlet.http.HttpServletResponse; import javax.servlet.http.HttpSession; -import org.apache.commons.lang.StringUtils; import org.apache.log4j.Logger; import org.apache.struts.action.ActionForm; import org.apache.struts.action.ActionForward; @@ -56,13 +55,6 @@ /** * @author - * @version - * - * - * - * - * - * */ public class AuthoringAction extends LamsDispatchAction { @@ -92,7 +84,7 @@ String contentFolderID = WebUtil.readStrParam(request, AttributeNames.PARAM_CONTENT_FOLDER_ID); - ToolAccessMode mode = WebUtil.readToolAccessModeParam(request, "mode", true); + ToolAccessMode mode = WebUtil.readToolAccessModeAuthorDefaulted(request); // set up gmapService if (gmapService == null) { @@ -108,7 +100,7 @@ // TODO NOTE: this causes DB orphans when LD not saved. } - if (mode != null && mode.isTeacher()) { + if (mode.isTeacher()) { // Set the defineLater flag so that learners cannot use content // while we // are editing. This flag is released when updateContent is called. @@ -121,7 +113,7 @@ updateAuthForm(authForm, gmap); // Set up sessionMap - SessionMap map = createSessionMap(gmap, getAccessMode(request), contentFolderID, toolContentID); + SessionMap map = createSessionMap(gmap, mode, contentFolderID, toolContentID); authForm.setSessionMapID(map.getSessionID()); authForm.setGmap(gmap); @@ -283,24 +275,6 @@ } /** - * Get ToolAccessMode from HttpRequest parameters. Default value is AUTHOR - * mode. - * - * @param request - * @return - */ - private ToolAccessMode getAccessMode(HttpServletRequest request) { - ToolAccessMode mode; - String modeStr = request.getParameter(AttributeNames.ATTR_MODE); - if (StringUtils.equalsIgnoreCase(modeStr, ToolAccessMode.TEACHER.toString())) { - mode = ToolAccessMode.TEACHER; - } else { - mode = ToolAccessMode.AUTHOR; - } - return mode; - } - - /** * Retrieve the SessionMap from the HttpSession using the author form. * * @param request Index: lams_tool_images/src/java/org/lamsfoundation/lams/tool/imageGallery/web/action/AuthoringAction.java =================================================================== RCS file: /usr/local/cvsroot/lams_tool_images/src/java/org/lamsfoundation/lams/tool/imageGallery/web/action/AuthoringAction.java,v diff -u -r1.9.2.14 -r1.9.2.15 --- lams_tool_images/src/java/org/lamsfoundation/lams/tool/imageGallery/web/action/AuthoringAction.java 30 Mar 2017 13:35:34 -0000 1.9.2.14 +++ lams_tool_images/src/java/org/lamsfoundation/lams/tool/imageGallery/web/action/AuthoringAction.java 30 Mar 2017 18:30:02 -0000 1.9.2.15 @@ -87,13 +87,8 @@ String param = mapping.getParameter(); // -----------------------ImageGallery Author function --------------------------- if (param.equals("start")) { - ToolAccessMode mode = getAccessMode(request); - // teacher mode "check for new" button enter. - if (mode != null) { - request.setAttribute(AttributeNames.ATTR_MODE, mode.toString()); - } else { - request.setAttribute(AttributeNames.ATTR_MODE, ToolAccessMode.AUTHOR.toString()); - } + ToolAccessMode mode = WebUtil.readToolAccessModeAuthorDefaulted(request); + request.setAttribute(AttributeNames.ATTR_MODE, mode.toString()); return start(mapping, form, request, response); } if (param.equals("definelater")) { @@ -255,7 +250,7 @@ throw new ServletException(e); } - ToolAccessMode mode = getAccessMode(request); + ToolAccessMode mode = WebUtil.readToolAccessModeAuthorDefaulted(request); request.setAttribute(AttributeNames.ATTR_MODE, mode.toString()); return mapping.findForward(ImageGalleryConstants.SUCCESS); @@ -278,7 +273,7 @@ // get back sessionMAP SessionMap sessionMap = (SessionMap) request.getSession().getAttribute(imageGalleryForm.getSessionMapID()); - ToolAccessMode mode = getAccessMode(request); + ToolAccessMode mode = WebUtil.readToolAccessModeAuthorDefaulted(request); request.setAttribute(AttributeNames.ATTR_MODE, mode.toString()); ImageGallery imageGallery = imageGalleryForm.getImageGallery(); @@ -861,21 +856,4 @@ } } - /** - * Get ToolAccessMode from HttpRequest parameters. Default value is AUTHOR mode. - * - * @param request - * @return - */ - private ToolAccessMode getAccessMode(HttpServletRequest request) { - ToolAccessMode mode; - String modeStr = request.getParameter(AttributeNames.ATTR_MODE); - if (StringUtils.equalsIgnoreCase(modeStr, ToolAccessMode.TEACHER.toString())) { - mode = ToolAccessMode.TEACHER; - } else { - mode = ToolAccessMode.AUTHOR; - } - return mode; - } - } Index: lams_tool_imscc/src/java/org/lamsfoundation/lams/tool/commonCartridge/web/action/AuthoringAction.java =================================================================== RCS file: /usr/local/cvsroot/lams_tool_imscc/src/java/org/lamsfoundation/lams/tool/commonCartridge/web/action/AuthoringAction.java,v diff -u -r1.5.2.4 -r1.5.2.5 --- lams_tool_imscc/src/java/org/lamsfoundation/lams/tool/commonCartridge/web/action/AuthoringAction.java 24 Mar 2017 16:37:03 -0000 1.5.2.4 +++ lams_tool_imscc/src/java/org/lamsfoundation/lams/tool/commonCartridge/web/action/AuthoringAction.java 30 Mar 2017 18:30:04 -0000 1.5.2.5 @@ -89,13 +89,8 @@ String param = mapping.getParameter(); // -----------------------CommonCartridge Author function --------------------------- if (param.equals("start")) { - ToolAccessMode mode = getAccessMode(request); - // teacher mode "check for new" button enter. - if (mode != null) { - request.setAttribute(AttributeNames.ATTR_MODE, mode.toString()); - } else { - request.setAttribute(AttributeNames.ATTR_MODE, ToolAccessMode.AUTHOR.toString()); - } + ToolAccessMode mode = WebUtil.readToolAccessModeAuthorDefaulted(request); + request.setAttribute(AttributeNames.ATTR_MODE, mode.toString()); return start(mapping, form, request, response); } if (param.equals("definelater")) { @@ -436,7 +431,7 @@ throw new ServletException(e); } - ToolAccessMode mode = getAccessMode(request); + ToolAccessMode mode = WebUtil.readToolAccessModeAuthorDefaulted(request); request.setAttribute(AttributeNames.ATTR_MODE, mode.toString()); return mapping.findForward(CommonCartridgeConstants.SUCCESS); @@ -460,7 +455,7 @@ // get back sessionMAP SessionMap sessionMap = (SessionMap) request.getSession().getAttribute(commonCartridgeForm.getSessionMapID()); - ToolAccessMode mode = getAccessMode(request); + ToolAccessMode mode = WebUtil.readToolAccessModeAuthorDefaulted(request); request.setAttribute(AttributeNames.ATTR_MODE, mode.toString()); CommonCartridge commonCartridge = commonCartridgeForm.getCommonCartridge(); @@ -810,23 +805,6 @@ return errors; } - /** - * Get ToolAccessMode from HttpRequest parameters. Default value is AUTHOR mode. - * - * @param request - * @return - */ - private ToolAccessMode getAccessMode(HttpServletRequest request) { - ToolAccessMode mode; - String modeStr = request.getParameter(AttributeNames.ATTR_MODE); - if (StringUtils.equalsIgnoreCase(modeStr, ToolAccessMode.TEACHER.toString())) { - mode = ToolAccessMode.TEACHER; - } else { - mode = ToolAccessMode.AUTHOR; - } - return mode; - } - public ActionForward initPedagogicalPlannerForm(ActionMapping mapping, ActionForm form, HttpServletRequest request, HttpServletResponse response) { CommonCartridgePedagogicalPlannerForm plannerForm = (CommonCartridgePedagogicalPlannerForm) form; Index: lams_tool_kaltura/src/java/org/lamsfoundation/lams/tool/kaltura/web/actions/AuthoringAction.java =================================================================== RCS file: /usr/local/cvsroot/lams_tool_kaltura/src/java/org/lamsfoundation/lams/tool/kaltura/web/actions/AuthoringAction.java,v diff -u -r1.3.2.3 -r1.3.2.4 --- lams_tool_kaltura/src/java/org/lamsfoundation/lams/tool/kaltura/web/actions/AuthoringAction.java 11 May 2016 07:37:16 -0000 1.3.2.3 +++ lams_tool_kaltura/src/java/org/lamsfoundation/lams/tool/kaltura/web/actions/AuthoringAction.java 30 Mar 2017 18:30:33 -0000 1.3.2.4 @@ -92,7 +92,7 @@ String contentFolderID = WebUtil.readStrParam(request, AttributeNames.PARAM_CONTENT_FOLDER_ID); - ToolAccessMode mode = getAccessMode(request); + ToolAccessMode mode = WebUtil.readToolAccessModeAuthorDefaulted(request); // set up kalturaService if (kalturaService == null) { @@ -107,7 +107,7 @@ kalturaService.saveOrUpdateKaltura(kaltura); } - if (mode != null && mode.isTeacher()) { + if (mode.isTeacher()) { // Set the defineLater flag so that learners cannot use content // while we // are editing. This flag is released when updateContent is called. @@ -365,20 +365,6 @@ } /** - * Get ToolAccessMode from HttpRequest parameters. Default value is AUTHOR mode. - */ - private ToolAccessMode getAccessMode(HttpServletRequest request) { - ToolAccessMode mode; - String modeStr = request.getParameter(AttributeNames.ATTR_MODE); - if (StringUtils.equalsIgnoreCase(modeStr, ToolAccessMode.TEACHER.toString())) { - mode = ToolAccessMode.TEACHER; - } else { - mode = ToolAccessMode.AUTHOR; - } - return mode; - } - - /** * Retrieve the SessionMap from the HttpSession. */ private SessionMap getSessionMap(HttpServletRequest request, AuthoringForm authForm) { Index: lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/McAction.java =================================================================== RCS file: /usr/local/cvsroot/lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/McAction.java,v diff -u -r1.143.2.5 -r1.143.2.6 --- lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/McAction.java 30 Sep 2016 01:06:50 -0000 1.143.2.5 +++ lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/McAction.java 30 Mar 2017 18:30:06 -0000 1.143.2.6 @@ -131,7 +131,7 @@ McContent mcContent = mcContentTest; if (errors.isEmpty()) { - ToolAccessMode mode = getAccessMode(request); + ToolAccessMode mode = WebUtil.readToolAccessModeAuthorDefaulted(request); request.setAttribute(AttributeNames.ATTR_MODE, mode.toString()); List deletedQuestionDTOs = (List) sessionMap.get(LIST_DELETED_QUESTION_DTOS); @@ -1582,7 +1582,7 @@ HttpServletResponse response) throws IOException, ServletException { McAuthoringForm mcAuthoringForm = (McAuthoringForm) form; - ToolAccessMode mode = getAccessMode(request); + ToolAccessMode mode = WebUtil.readToolAccessModeAuthorDefaulted(request); request.setAttribute(AttributeNames.ATTR_MODE, mode.toString()); IMcService mcService = McServiceProxy.getMcService(getServlet().getServletContext()); @@ -2007,23 +2007,6 @@ } /** - * Get ToolAccessMode from HttpRequest parameters. Default value is AUTHOR mode. - * - * @param request - * @return - */ - private ToolAccessMode getAccessMode(HttpServletRequest request) { - ToolAccessMode mode; - String modeStr = request.getParameter(AttributeNames.ATTR_MODE); - if (StringUtils.equalsIgnoreCase(modeStr, ToolAccessMode.TEACHER.toString())) { - mode = ToolAccessMode.TEACHER; - } else { - mode = ToolAccessMode.AUTHOR; - } - return mode; - } - - /** * repopulateOptionsBox */ private static List repopulateOptionDTOs(HttpServletRequest request, boolean isAddBlankOptions) { Index: lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/McStarterAction.java =================================================================== RCS file: /usr/local/cvsroot/lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/McStarterAction.java,v diff -u -r1.99.2.4 -r1.99.2.5 --- lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/McStarterAction.java 11 May 2016 07:36:13 -0000 1.99.2.4 +++ lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/McStarterAction.java 30 Mar 2017 18:30:06 -0000 1.99.2.5 @@ -97,7 +97,7 @@ String strToolContentID = request.getParameter(AttributeNames.PARAM_TOOL_CONTENT_ID); mcGeneralAuthoringDTO.setToolContentID(strToolContentID); - ToolAccessMode mode = getAccessMode(request); + ToolAccessMode mode = WebUtil.readToolAccessModeAuthorDefaulted(request); // request is from monitoring module if (mode.isTeacher()) { mcService.setDefineLater(strToolContentID, true); @@ -269,21 +269,4 @@ errors.add(Globals.ERROR_KEY, new ActionMessage(message)); saveErrors(request, errors); } - - /** - * Get ToolAccessMode from HttpRequest parameters. Default value is AUTHOR mode. - * - * @param request - * @return - */ - private ToolAccessMode getAccessMode(HttpServletRequest request) { - ToolAccessMode mode; - String modeStr = request.getParameter(AttributeNames.ATTR_MODE); - if (StringUtils.equalsIgnoreCase(modeStr, ToolAccessMode.TEACHER.toString())) { - mode = ToolAccessMode.TEACHER; - } else { - mode = ToolAccessMode.AUTHOR; - } - return mode; - } } Index: lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/QaAction.java =================================================================== RCS file: /usr/local/cvsroot/lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/QaAction.java,v diff -u -r1.39.2.7 -r1.39.2.8 --- lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/QaAction.java 13 Oct 2016 14:00:23 -0000 1.39.2.7 +++ lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/QaAction.java 30 Mar 2017 18:30:56 -0000 1.39.2.8 @@ -129,7 +129,7 @@ QaContent qaContent = qaService.getQaContent(toolContentID); if (errors.isEmpty()) { - ToolAccessMode mode = getAccessMode(request); + ToolAccessMode mode = WebUtil.readToolAccessModeAuthorDefaulted(request); request.setAttribute(AttributeNames.ATTR_MODE, mode.toString()); List deletedQuestionDTOs = (List) sessionMap.get(LIST_DELETED_QUESTION_DTOS); @@ -972,21 +972,4 @@ } return list; } - - /** - * Get ToolAccessMode from HttpRequest parameters. Default value is AUTHOR mode. - * - * @param request - * @return - */ - private ToolAccessMode getAccessMode(HttpServletRequest request) { - ToolAccessMode mode; - String modeStr = request.getParameter(AttributeNames.ATTR_MODE); - if (StringUtils.equalsIgnoreCase(modeStr, ToolAccessMode.TEACHER.toString())) { - mode = ToolAccessMode.TEACHER; - } else { - mode = ToolAccessMode.AUTHOR; - } - return mode; - } } Index: lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/QaStarterAction.java =================================================================== RCS file: /usr/local/cvsroot/lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/QaStarterAction.java,v diff -u -r1.83.2.7 -r1.83.2.8 --- lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/QaStarterAction.java 13 Dec 2016 14:33:23 -0000 1.83.2.7 +++ lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/QaStarterAction.java 30 Mar 2017 18:30:57 -0000 1.83.2.8 @@ -118,7 +118,7 @@ prepareDTOandForm(request, qaAuthoringForm, qaContent, qaService, sessionMap); - ToolAccessMode mode = getAccessMode(request); + ToolAccessMode mode = WebUtil.readToolAccessModeAuthorDefaulted(request); // request is from monitoring module if (mode.isTeacher()) { qaService.setDefineLater(strToolContentID, true); @@ -281,21 +281,4 @@ } return list; } - - /** - * Get ToolAccessMode from HttpRequest parameters. Default value is AUTHOR mode. - * - * @param request - * @return - */ - private ToolAccessMode getAccessMode(HttpServletRequest request) { - ToolAccessMode mode; - String modeStr = request.getParameter(AttributeNames.ATTR_MODE); - if (StringUtils.equalsIgnoreCase(modeStr, ToolAccessMode.TEACHER.toString())) { - mode = ToolAccessMode.TEACHER; - } else { - mode = ToolAccessMode.AUTHOR; - } - return mode; - } } 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.62.2.6 -r1.62.2.7 --- lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/web/action/AuthoringAction.java 24 Mar 2017 11:29:46 -0000 1.62.2.6 +++ lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/web/action/AuthoringAction.java 30 Mar 2017 18:30:41 -0000 1.62.2.7 @@ -98,13 +98,8 @@ // -----------------------Resource Author function // --------------------------- if (param.equals("start")) { - ToolAccessMode mode = getAccessMode(request); - // teacher mode "check for new" button enter. - if (mode != null) { - request.setAttribute(AttributeNames.ATTR_MODE, mode.toString()); - } else { - request.setAttribute(AttributeNames.ATTR_MODE, ToolAccessMode.AUTHOR.toString()); - } + ToolAccessMode mode = WebUtil.readToolAccessModeAuthorDefaulted(request); + request.setAttribute(AttributeNames.ATTR_MODE, mode.toString()); return start(mapping, form, request, response); } if (param.equals("definelater")) { @@ -487,7 +482,7 @@ throw new ServletException(e); } - ToolAccessMode mode = getAccessMode(request); + ToolAccessMode mode = WebUtil.readToolAccessModeAuthorDefaulted(request); request.setAttribute(AttributeNames.ATTR_MODE, mode.toString()); return mapping.findForward(ResourceConstants.SUCCESS); @@ -511,7 +506,7 @@ // get back sessionMAP SessionMap sessionMap = (SessionMap) request.getSession().getAttribute(resourceForm.getSessionMapID()); - ToolAccessMode mode = getAccessMode(request); + ToolAccessMode mode = WebUtil.readToolAccessModeAuthorDefaulted(request); request.setAttribute(AttributeNames.ATTR_MODE, mode.toString()); ActionMessages errors = validate(resourceForm, mapping, request); @@ -939,24 +934,6 @@ return errors; } - /** - * Get ToolAccessMode from HttpRequest parameters. Default value is AUTHOR - * mode. - * - * @param request - * @return - */ - private ToolAccessMode getAccessMode(HttpServletRequest request) { - ToolAccessMode mode; - String modeStr = request.getParameter(AttributeNames.ATTR_MODE); - if (StringUtils.equalsIgnoreCase(modeStr, ToolAccessMode.TEACHER.toString())) { - mode = ToolAccessMode.TEACHER; - } else { - mode = ToolAccessMode.AUTHOR; - } - return mode; - } - private ActionMessages validate(ResourceForm resourceForm, ActionMapping mapping, HttpServletRequest request) { ActionMessages errors = new ActionMessages(); if (StringUtils.isBlank(resourceForm.getResource().getTitle())) { Index: lams_tool_leader/src/java/org/lamsfoundation/lams/tool/leaderselection/web/actions/AuthoringAction.java =================================================================== RCS file: /usr/local/cvsroot/lams_tool_leader/src/java/org/lamsfoundation/lams/tool/leaderselection/web/actions/AuthoringAction.java,v diff -u -r1.1.2.3 -r1.1.2.4 --- lams_tool_leader/src/java/org/lamsfoundation/lams/tool/leaderselection/web/actions/AuthoringAction.java 11 May 2016 07:37:51 -0000 1.1.2.3 +++ lams_tool_leader/src/java/org/lamsfoundation/lams/tool/leaderselection/web/actions/AuthoringAction.java 30 Mar 2017 18:30:45 -0000 1.1.2.4 @@ -76,7 +76,7 @@ String contentFolderID = WebUtil.readStrParam(request, AttributeNames.PARAM_CONTENT_FOLDER_ID); - ToolAccessMode mode = WebUtil.readToolAccessModeParam(request, "mode", true); + ToolAccessMode mode = WebUtil.readToolAccessModeAuthorDefaulted(request); // set up leaderselectionService if (leaderselectionService == null) { @@ -93,7 +93,7 @@ // TODO NOTE: this causes DB orphans when LD not saved. } - if (mode != null && mode.isTeacher()) { + if (mode.isTeacher()) { // Set the defineLater flag so that learners cannot use content // while we // are editing. This flag is released when updateContent is called. @@ -108,7 +108,7 @@ // Set up sessionMap SessionMap map = new SessionMap(); - map.put(AuthoringAction.KEY_MODE, getAccessMode(request)); + map.put(AuthoringAction.KEY_MODE, mode); map.put(AuthoringAction.KEY_CONTENT_FOLDER_ID, contentFolderID); map.put(AuthoringAction.KEY_TOOL_CONTENT_ID, toolContentID); authForm.setSessionMapID(map.getSessionID()); @@ -155,23 +155,4 @@ return mapping.findForward("success"); } - - /* ========== Private Methods ********** */ - - /** - * Get ToolAccessMode from HttpRequest parameters. Default value is AUTHOR mode. - * - * @param request - * @return - */ - private ToolAccessMode getAccessMode(HttpServletRequest request) { - ToolAccessMode mode; - String modeStr = request.getParameter(AttributeNames.ATTR_MODE); - if (StringUtils.equalsIgnoreCase(modeStr, ToolAccessMode.TEACHER.toString())) { - mode = ToolAccessMode.TEACHER; - } else { - mode = ToolAccessMode.AUTHOR; - } - return mode; - } } Index: lams_tool_mindmap/src/java/org/lamsfoundation/lams/tool/mindmap/web/actions/AuthoringAction.java =================================================================== RCS file: /usr/local/cvsroot/lams_tool_mindmap/src/java/org/lamsfoundation/lams/tool/mindmap/web/actions/AuthoringAction.java,v diff -u -r1.5.2.5 -r1.5.2.6 --- lams_tool_mindmap/src/java/org/lamsfoundation/lams/tool/mindmap/web/actions/AuthoringAction.java 11 May 2016 07:37:44 -0000 1.5.2.5 +++ lams_tool_mindmap/src/java/org/lamsfoundation/lams/tool/mindmap/web/actions/AuthoringAction.java 30 Mar 2017 18:29:55 -0000 1.5.2.6 @@ -84,7 +84,7 @@ // Extract toolContentID from parameters. Long toolContentID = new Long(WebUtil.readLongParam(request, AttributeNames.PARAM_TOOL_CONTENT_ID)); String contentFolderID = WebUtil.readStrParam(request, AttributeNames.PARAM_CONTENT_FOLDER_ID); - ToolAccessMode mode = WebUtil.readToolAccessModeParam(request, "mode", true); + ToolAccessMode mode = WebUtil.readToolAccessModeAuthorDefaulted(request); // set up mindmapService if (mindmapService == null) { @@ -111,7 +111,7 @@ mindmapService.saveMindmapNode(null, rootMindmapNode, 3l, childNodeName2, "ffffff", null, mindmap, null); } - if (mode != null && mode.isTeacher()) { + if (mode.isTeacher()) { // Set the defineLater flag so that learners cannot use content // while we are editing. This flag is released when updateContent is called. mindmap.setDefineLater(true); @@ -139,7 +139,7 @@ updateAuthForm(authForm, mindmap); // Set up sessionMap - SessionMap map = createSessionMap(mindmap, getAccessMode(request), contentFolderID, + SessionMap map = createSessionMap(mindmap, mode, contentFolderID, toolContentID); authForm.setSessionMapID(map.getSessionID()); @@ -337,22 +337,6 @@ } /** - * Gets ToolAccessMode from HttpRequest parameters. Default value is AUTHOR mode. - * - * @param request - */ - private ToolAccessMode getAccessMode(HttpServletRequest request) { - ToolAccessMode mode; - String modeStr = request.getParameter(AttributeNames.ATTR_MODE); - if (StringUtils.equalsIgnoreCase(modeStr, ToolAccessMode.TEACHER.toString())) { - mode = ToolAccessMode.TEACHER; - } else { - mode = ToolAccessMode.AUTHOR; - } - return mode; - } - - /** * Retrieve the SessionMap from the HttpSession. * * @param request Index: lams_tool_notebook/src/java/org/lamsfoundation/lams/tool/notebook/web/actions/AuthoringAction.java =================================================================== RCS file: /usr/local/cvsroot/lams_tool_notebook/src/java/org/lamsfoundation/lams/tool/notebook/web/actions/AuthoringAction.java,v diff -u -r1.21.2.4 -r1.21.2.5 --- lams_tool_notebook/src/java/org/lamsfoundation/lams/tool/notebook/web/actions/AuthoringAction.java 23 Nov 2016 08:14:14 -0000 1.21.2.4 +++ lams_tool_notebook/src/java/org/lamsfoundation/lams/tool/notebook/web/actions/AuthoringAction.java 30 Mar 2017 18:29:53 -0000 1.21.2.5 @@ -86,7 +86,7 @@ String contentFolderID = WebUtil.readStrParam(request, AttributeNames.PARAM_CONTENT_FOLDER_ID); - ToolAccessMode mode = WebUtil.readToolAccessModeParam(request, "mode", true); + ToolAccessMode mode = WebUtil.readToolAccessModeAuthorDefaulted(request); // set up notebookService if (notebookService == null) { @@ -102,7 +102,7 @@ // TODO NOTE: this causes DB orphans when LD not saved. } - if (mode != null && mode.isTeacher()) { + if (mode.isTeacher()) { // Set the defineLater flag so that learners cannot use content while we are editing. This flag is released // when updateContent is called. notebook.setDefineLater(true); @@ -114,7 +114,7 @@ updateAuthForm(authForm, notebook); // Set up sessionMap - SessionMap map = createSessionMap(notebook, getAccessMode(request), contentFolderID, + SessionMap map = createSessionMap(notebook, mode, contentFolderID, toolContentID); authForm.setSessionMapID(map.getSessionID()); @@ -243,23 +243,6 @@ } /** - * Get ToolAccessMode from HttpRequest parameters. Default value is AUTHOR mode. - * - * @param request - * @return - */ - private ToolAccessMode getAccessMode(HttpServletRequest request) { - ToolAccessMode mode; - String modeStr = request.getParameter(AttributeNames.ATTR_MODE); - if (StringUtils.equalsIgnoreCase(modeStr, ToolAccessMode.TEACHER.toString())) { - mode = ToolAccessMode.TEACHER; - } else { - mode = ToolAccessMode.AUTHOR; - } - return mode; - } - - /** * Retrieve the SessionMap from the HttpSession. * * @param request Index: lams_tool_pixlr/src/java/org/lamsfoundation/lams/tool/pixlr/web/actions/AuthoringAction.java =================================================================== RCS file: /usr/local/cvsroot/lams_tool_pixlr/src/java/org/lamsfoundation/lams/tool/pixlr/web/actions/AuthoringAction.java,v diff -u -r1.4.2.3 -r1.4.2.4 --- lams_tool_pixlr/src/java/org/lamsfoundation/lams/tool/pixlr/web/actions/AuthoringAction.java 11 May 2016 07:37:25 -0000 1.4.2.3 +++ lams_tool_pixlr/src/java/org/lamsfoundation/lams/tool/pixlr/web/actions/AuthoringAction.java 30 Mar 2017 18:30:44 -0000 1.4.2.4 @@ -97,11 +97,7 @@ AuthoringForm authForm = (AuthoringForm) form; - ToolAccessMode mode = null; - String modeStr = WebUtil.readStrParam(request, "mode", true); - if (modeStr != null && !modeStr.trim().equals("")) { - mode = WebUtil.readToolAccessModeParam(request, "mode", true); - } + ToolAccessMode mode = WebUtil.readToolAccessModeAuthorDefaulted(request); // set up pixlrService if (pixlrService == null) { @@ -117,7 +113,7 @@ // TODO NOTE: this causes DB orphans when LD not saved. } - if (mode != null && mode.isTeacher()) { + if (mode.isTeacher()) { // Set the defineLater flag so that learners cannot use content // while we // are editing. This flag is released when updateContent is called. @@ -141,15 +137,11 @@ // Set up the authForm. updateAuthForm(authForm, pixlr); authForm.setToolContentID(toolContentID); - if (mode != null) { - authForm.setMode(mode.toString()); - } else { - authForm.setMode(""); - } + authForm.setMode(mode.toString()); authForm.setContentFolderID(contentFolderID); // Set up sessionMap - SessionMap map = createSessionMap(pixlr, getAccessMode(request), contentFolderID, + SessionMap map = createSessionMap(pixlr, mode, contentFolderID, toolContentID); authForm.setSessionMapID(map.getSessionID()); @@ -288,24 +280,6 @@ } /** - * Get ToolAccessMode from HttpRequest parameters. Default value is AUTHOR - * mode. - * - * @param request - * @return - */ - private ToolAccessMode getAccessMode(HttpServletRequest request) { - ToolAccessMode mode; - String modeStr = request.getParameter(AttributeNames.ATTR_MODE); - if (StringUtils.equalsIgnoreCase(modeStr, ToolAccessMode.TEACHER.toString())) { - mode = ToolAccessMode.TEACHER; - } else { - mode = ToolAccessMode.AUTHOR; - } - return mode; - } - - /** * Retrieve the SessionMap from the HttpSession. * * @param request Index: lams_tool_preview/src/java/org/lamsfoundation/lams/tool/peerreview/web/action/AuthoringAction.java =================================================================== RCS file: /usr/local/cvsroot/lams_tool_preview/src/java/org/lamsfoundation/lams/tool/peerreview/web/action/AuthoringAction.java,v diff -u -r1.1.2.4 -r1.1.2.5 --- lams_tool_preview/src/java/org/lamsfoundation/lams/tool/peerreview/web/action/AuthoringAction.java 24 Mar 2017 16:37:17 -0000 1.1.2.4 +++ lams_tool_preview/src/java/org/lamsfoundation/lams/tool/peerreview/web/action/AuthoringAction.java 30 Mar 2017 18:29:52 -0000 1.1.2.5 @@ -69,13 +69,8 @@ String param = mapping.getParameter(); if (param.equals("start")) { - ToolAccessMode mode = getAccessMode(request); - // teacher mode "check for new" button enter. - if (mode != null) { - request.setAttribute(AttributeNames.ATTR_MODE, mode.toString()); - } else { - request.setAttribute(AttributeNames.ATTR_MODE, ToolAccessMode.AUTHOR.toString()); - } + ToolAccessMode mode = WebUtil.readToolAccessModeAuthorDefaulted(request); + request.setAttribute(AttributeNames.ATTR_MODE, mode.toString()); return start(mapping, form, request, response); } if (param.equals("definelater")) { @@ -178,7 +173,7 @@ throw new ServletException(e); } - ToolAccessMode mode = getAccessMode(request); + ToolAccessMode mode = WebUtil.readToolAccessModeAuthorDefaulted(request); request.setAttribute(AttributeNames.ATTR_MODE, mode.toString()); return mapping.findForward(PeerreviewConstants.SUCCESS); @@ -203,7 +198,7 @@ SessionMap sessionMap = (SessionMap) request.getSession() .getAttribute(peerreviewForm.getSessionMapID()); - ToolAccessMode mode = getAccessMode(request); + ToolAccessMode mode = WebUtil.readToolAccessModeAuthorDefaulted(request); request.setAttribute(AttributeNames.ATTR_MODE, mode.toString()); Peerreview peerreview = peerreviewForm.getPeerreview(); @@ -270,22 +265,4 @@ return (IPeerreviewService) wac.getBean(PeerreviewConstants.PEERREVIEW_SERVICE); } - /** - * Get ToolAccessMode from HttpRequest parameters. Default value is AUTHOR - * mode. - * - * @param request - * @return - */ - private ToolAccessMode getAccessMode(HttpServletRequest request) { - ToolAccessMode mode; - String modeStr = request.getParameter(AttributeNames.ATTR_MODE); - if (StringUtils.equalsIgnoreCase(modeStr, ToolAccessMode.TEACHER.toString())) { - mode = ToolAccessMode.TEACHER; - } else { - mode = ToolAccessMode.AUTHOR; - } - return mode; - } - } Index: lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/web/action/AuthoringAction.java =================================================================== RCS file: /usr/local/cvsroot/lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/web/action/AuthoringAction.java,v diff -u -r1.20.2.3 -r1.20.2.4 --- lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/web/action/AuthoringAction.java 11 May 2016 07:38:01 -0000 1.20.2.3 +++ lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/web/action/AuthoringAction.java 30 Mar 2017 18:30:48 -0000 1.20.2.4 @@ -90,13 +90,8 @@ // -----------------------Scratchie Author functions ----------- String param = mapping.getParameter(); if (param.equals("start")) { - ToolAccessMode mode = getAccessMode(request); - // teacher mode "check for new" button enter. - if (mode != null) { - request.setAttribute(AttributeNames.ATTR_MODE, mode.toString()); - } else { - request.setAttribute(AttributeNames.ATTR_MODE, ToolAccessMode.AUTHOR.toString()); - } + ToolAccessMode mode = WebUtil.readToolAccessModeAuthorDefaulted(request); + request.setAttribute(AttributeNames.ATTR_MODE, mode.toString()); return start(mapping, form, request, response); } if (param.equals("definelater")) { @@ -271,7 +266,7 @@ throw new ServletException(e); } - ToolAccessMode mode = getAccessMode(request); + ToolAccessMode mode = WebUtil.readToolAccessModeAuthorDefaulted(request); request.setAttribute(AttributeNames.ATTR_MODE, mode.toString()); return mapping.findForward(ScratchieConstants.SUCCESS); @@ -288,7 +283,7 @@ SessionMap sessionMap = (SessionMap) request.getSession() .getAttribute(scratchieForm.getSessionMapID()); - ToolAccessMode mode = getAccessMode(request); + ToolAccessMode mode = WebUtil.readToolAccessModeAuthorDefaulted(request); Scratchie scratchie = scratchieForm.getScratchie(); IScratchieService service = getScratchieService(); @@ -982,21 +977,4 @@ } } - /** - * Get ToolAccessMode from HttpRequest parameters. Default value is AUTHOR mode. - * - * @param request - * @return - */ - private ToolAccessMode getAccessMode(HttpServletRequest request) { - ToolAccessMode mode; - String modeStr = request.getParameter(AttributeNames.ATTR_MODE); - if (StringUtils.equalsIgnoreCase(modeStr, ToolAccessMode.TEACHER.toString())) { - mode = ToolAccessMode.TEACHER; - } else { - mode = ToolAccessMode.AUTHOR; - } - return mode; - } - } Index: lams_tool_scribe/src/java/org/lamsfoundation/lams/tool/scribe/web/actions/AuthoringAction.java =================================================================== RCS file: /usr/local/cvsroot/lams_tool_scribe/src/java/org/lamsfoundation/lams/tool/scribe/web/actions/AuthoringAction.java,v diff -u -r1.15.2.3 -r1.15.2.4 --- lams_tool_scribe/src/java/org/lamsfoundation/lams/tool/scribe/web/actions/AuthoringAction.java 11 May 2016 07:35:46 -0000 1.15.2.3 +++ lams_tool_scribe/src/java/org/lamsfoundation/lams/tool/scribe/web/actions/AuthoringAction.java 30 Mar 2017 18:31:00 -0000 1.15.2.4 @@ -95,7 +95,7 @@ String contentFolderID = WebUtil.readStrParam(request, AttributeNames.PARAM_CONTENT_FOLDER_ID); - ToolAccessMode mode = WebUtil.readToolAccessModeParam(request, "mode", true); + ToolAccessMode mode = WebUtil.readToolAccessModeAuthorDefaulted(request); // set up scribeService if (scribeService == null) { @@ -119,7 +119,7 @@ return mapping.findForward("message_page"); } - if (mode != null && mode.isTeacher()) { + if (mode.isTeacher()) { // Set the defineLater flag so that learners cannot use content // while we // are editing. This flag is released when updateContent is called. @@ -132,7 +132,7 @@ updateAuthForm(authForm, scribe); // Set up sessionMap - SessionMap map = createSessionMap(scribe, getAccessMode(request), contentFolderID, + SessionMap map = createSessionMap(scribe, mode, contentFolderID, toolContentID); authForm.setSessionMapID(map.getSessionID()); @@ -389,24 +389,6 @@ return map; } - /** - * Get ToolAccessMode from HttpRequest parameters. Default value is AUTHOR - * mode. - * - * @param request - * @return - */ - private ToolAccessMode getAccessMode(HttpServletRequest request) { - ToolAccessMode mode; - String modeStr = request.getParameter(AttributeNames.ATTR_MODE); - if (StringUtils.equalsIgnoreCase(modeStr, ToolAccessMode.TEACHER.toString())) { - mode = ToolAccessMode.TEACHER; - } else { - mode = ToolAccessMode.AUTHOR; - } - return mode; - } - private List getHeadingList(SessionMap map) { return (List) map.get(KEY_HEADINGS); } Index: lams_tool_spreadsheet/src/java/org/lamsfoundation/lams/tool/spreadsheet/web/action/AuthoringAction.java =================================================================== RCS file: /usr/local/cvsroot/lams_tool_spreadsheet/src/java/org/lamsfoundation/lams/tool/spreadsheet/web/action/AuthoringAction.java,v diff -u -r1.4.2.3 -r1.4.2.4 --- lams_tool_spreadsheet/src/java/org/lamsfoundation/lams/tool/spreadsheet/web/action/AuthoringAction.java 24 Mar 2017 16:36:59 -0000 1.4.2.3 +++ lams_tool_spreadsheet/src/java/org/lamsfoundation/lams/tool/spreadsheet/web/action/AuthoringAction.java 30 Mar 2017 18:29:47 -0000 1.4.2.4 @@ -66,13 +66,8 @@ String param = mapping.getParameter(); // -----------------------Spreadsheet Author function --------------------------- if (param.equals("start")) { - ToolAccessMode mode = getAccessMode(request); - // teacher mode "check for new" button enter. - if (mode != null) { - request.setAttribute(AttributeNames.ATTR_MODE, mode.toString()); - } else { - request.setAttribute(AttributeNames.ATTR_MODE, ToolAccessMode.AUTHOR.toString()); - } + ToolAccessMode mode = WebUtil.readToolAccessModeAuthorDefaulted(request); + request.setAttribute(AttributeNames.ATTR_MODE, mode.toString()); return start(mapping, form, request, response); } if (param.equals("definelater")) { @@ -169,7 +164,7 @@ throw new ServletException(e); } - ToolAccessMode mode = getAccessMode(request); + ToolAccessMode mode = WebUtil.readToolAccessModeAuthorDefaulted(request); request.setAttribute(AttributeNames.ATTR_MODE, mode.toString()); return mapping.findForward(SpreadsheetConstants.SUCCESS); @@ -189,7 +184,7 @@ HttpServletResponse response) throws Exception { SpreadsheetForm spreadsheetForm = (SpreadsheetForm) (form); - ToolAccessMode mode = getAccessMode(request); + ToolAccessMode mode = WebUtil.readToolAccessModeAuthorDefaulted(request); request.setAttribute(AttributeNames.ATTR_MODE, mode.toString()); Spreadsheet spreadsheet = spreadsheetForm.getSpreadsheet(); @@ -251,21 +246,4 @@ return (ISpreadsheetService) wac.getBean(SpreadsheetConstants.RESOURCE_SERVICE); } - /** - * Get ToolAccessMode from HttpRequest parameters. Default value is AUTHOR mode. - * - * @param request - * @return - */ - private ToolAccessMode getAccessMode(HttpServletRequest request) { - ToolAccessMode mode; - String modeStr = request.getParameter(AttributeNames.ATTR_MODE); - if (StringUtils.equalsIgnoreCase(modeStr, ToolAccessMode.TEACHER.toString())) { - mode = ToolAccessMode.TEACHER; - } else { - mode = ToolAccessMode.AUTHOR; - } - return mode; - } - } Index: lams_tool_spreadsheet/src/java/org/lamsfoundation/lams/tool/spreadsheet/web/action/LearningAction.java =================================================================== RCS file: /usr/local/cvsroot/lams_tool_spreadsheet/src/java/org/lamsfoundation/lams/tool/spreadsheet/web/action/LearningAction.java,v diff -u -r1.7.2.4 -r1.7.2.5 --- lams_tool_spreadsheet/src/java/org/lamsfoundation/lams/tool/spreadsheet/web/action/LearningAction.java 27 Feb 2017 08:44:32 -0000 1.7.2.4 +++ lams_tool_spreadsheet/src/java/org/lamsfoundation/lams/tool/spreadsheet/web/action/LearningAction.java 30 Mar 2017 18:29:47 -0000 1.7.2.5 @@ -396,21 +396,4 @@ } return spreadsheetUser; } - - /** - * Get ToolAccessMode from HttpRequest parameters. Default value is AUTHOR mode. - * - * @param request - * @return - */ - private ToolAccessMode getAccessMode(HttpServletRequest request) { - ToolAccessMode mode; - String modeStr = request.getParameter(AttributeNames.ATTR_MODE); - if (StringUtils.equalsIgnoreCase(modeStr, ToolAccessMode.TEACHER.toString())) { - mode = ToolAccessMode.TEACHER; - } else { - mode = ToolAccessMode.AUTHOR; - } - return mode; - } } Index: lams_tool_survey/src/java/org/lamsfoundation/lams/tool/survey/web/action/AuthoringAction.java =================================================================== RCS file: /usr/local/cvsroot/lams_tool_survey/src/java/org/lamsfoundation/lams/tool/survey/web/action/AuthoringAction.java,v diff -u -r1.27.2.4 -r1.27.2.5 --- lams_tool_survey/src/java/org/lamsfoundation/lams/tool/survey/web/action/AuthoringAction.java 27 Mar 2017 17:28:19 -0000 1.27.2.4 +++ lams_tool_survey/src/java/org/lamsfoundation/lams/tool/survey/web/action/AuthoringAction.java 30 Mar 2017 18:30:53 -0000 1.27.2.5 @@ -94,13 +94,8 @@ String param = mapping.getParameter(); // -----------------------Survey Author function --------------------------- if (param.equals("start")) { - ToolAccessMode mode = getAccessMode(request); - // teacher mode "check for new" button enter. - if (mode != null) { - request.setAttribute(AttributeNames.ATTR_MODE, mode.toString()); - } else { - request.setAttribute(AttributeNames.ATTR_MODE, ToolAccessMode.AUTHOR.toString()); - } + ToolAccessMode mode = WebUtil.readToolAccessModeAuthorDefaulted(request); + request.setAttribute(AttributeNames.ATTR_MODE, mode.toString()); return start(mapping, form, request, response); } if (param.equals("definelater")) { @@ -501,7 +496,7 @@ throw new ServletException(e); } - ToolAccessMode mode = getAccessMode(request); + ToolAccessMode mode = WebUtil.readToolAccessModeAuthorDefaulted(request); request.setAttribute(AttributeNames.ATTR_MODE, mode.toString()); return mapping.findForward(SurveyConstants.SUCCESS); @@ -524,7 +519,7 @@ // get back sessionMAP SessionMap sessionMap = (SessionMap) request.getSession().getAttribute(surveyForm.getSessionMapID()); - ToolAccessMode mode = getAccessMode(request); + ToolAccessMode mode = WebUtil.readToolAccessModeAuthorDefaulted(request); request.setAttribute(AttributeNames.ATTR_MODE, mode.toString()); Survey survey = surveyForm.getSurvey(); @@ -869,23 +864,6 @@ } /** - * Get ToolAccessMode from HttpRequest parameters. Default value is AUTHOR mode. - * - * @param request - * @return - */ - private ToolAccessMode getAccessMode(HttpServletRequest request) { - ToolAccessMode mode; - String modeStr = request.getParameter(AttributeNames.ATTR_MODE); - if (StringUtils.equalsIgnoreCase(modeStr, ToolAccessMode.TEACHER.toString())) { - mode = ToolAccessMode.TEACHER; - } else { - mode = ToolAccessMode.AUTHOR; - } - return mode; - } - - /** * Ajax call, will add one more input line for new survey item instruction. * * @param mapping Index: lams_tool_task/src/java/org/lamsfoundation/lams/tool/taskList/web/action/AuthoringAction.java =================================================================== RCS file: /usr/local/cvsroot/lams_tool_task/src/java/org/lamsfoundation/lams/tool/taskList/web/action/AuthoringAction.java,v diff -u -r1.20.2.4 -r1.20.2.5 --- lams_tool_task/src/java/org/lamsfoundation/lams/tool/taskList/web/action/AuthoringAction.java 24 Mar 2017 16:36:56 -0000 1.20.2.4 +++ lams_tool_task/src/java/org/lamsfoundation/lams/tool/taskList/web/action/AuthoringAction.java 30 Mar 2017 18:29:50 -0000 1.20.2.5 @@ -93,13 +93,8 @@ // ----------------------- solid taskList methods --------------------------- if (param.equals("start")) { - ToolAccessMode mode = getAccessMode(request); - // teacher mode "check for new" button enter. - if (mode != null) { - request.setAttribute(AttributeNames.ATTR_MODE, mode.toString()); - } else { - request.setAttribute(AttributeNames.ATTR_MODE, ToolAccessMode.AUTHOR.toString()); - } + ToolAccessMode mode = WebUtil.readToolAccessModeAuthorDefaulted(request); + request.setAttribute(AttributeNames.ATTR_MODE, mode.toString()); return start(mapping, form, request, response); } if (param.equals("definelater")) { @@ -264,7 +259,7 @@ throw new ServletException(e); } - ToolAccessMode mode = getAccessMode(request); + ToolAccessMode mode = WebUtil.readToolAccessModeAuthorDefaulted(request); request.setAttribute(AttributeNames.ATTR_MODE, mode.toString()); return mapping.findForward(TaskListConstants.SUCCESS); @@ -287,7 +282,7 @@ // get back sessionMAP SessionMap sessionMap = (SessionMap) request.getSession().getAttribute(taskListForm.getSessionMapID()); - ToolAccessMode mode = getAccessMode(request); + ToolAccessMode mode = WebUtil.readToolAccessModeAuthorDefaulted(request); request.setAttribute(AttributeNames.ATTR_MODE, mode.toString()); TaskList taskList = taskListForm.getTaskList(); @@ -769,23 +764,6 @@ return errors; } - /** - * Get ToolAccessMode from HttpRequest parameters. Default value is AUTHOR mode. - * - * @param request - * @return - */ - private ToolAccessMode getAccessMode(HttpServletRequest request) { - ToolAccessMode mode; - String modeStr = request.getParameter(AttributeNames.ATTR_MODE); - if (StringUtils.equalsIgnoreCase(modeStr, ToolAccessMode.TEACHER.toString())) { - mode = ToolAccessMode.TEACHER; - } else { - mode = ToolAccessMode.AUTHOR; - } - return mode; - } - public ActionForward initPedagogicalPlannerForm(ActionMapping mapping, ActionForm form, HttpServletRequest request, HttpServletResponse response) { TaskListPedagogicalPlannerForm plannerForm = (TaskListPedagogicalPlannerForm) form; Index: lams_tool_task/src/java/org/lamsfoundation/lams/tool/taskList/web/action/AuthoringTaskListConditionAction.java =================================================================== RCS file: /usr/local/cvsroot/lams_tool_task/src/java/org/lamsfoundation/lams/tool/taskList/web/action/AuthoringTaskListConditionAction.java,v diff -u -r1.5.12.3 -r1.5.12.4 --- lams_tool_task/src/java/org/lamsfoundation/lams/tool/taskList/web/action/AuthoringTaskListConditionAction.java 11 May 2016 07:35:22 -0000 1.5.12.3 +++ lams_tool_task/src/java/org/lamsfoundation/lams/tool/taskList/web/action/AuthoringTaskListConditionAction.java 30 Mar 2017 18:29:50 -0000 1.5.12.4 @@ -123,7 +123,7 @@ throw new ServletException(e); } - ToolAccessMode mode = getAccessMode(request); + ToolAccessMode mode = WebUtil.readToolAccessModeAuthorDefaulted(request); if (mode.isAuthor()) { return mapping.findForward(TaskListConstants.SUCCESS); } else { @@ -533,23 +533,6 @@ return errors; } - /** - * Get ToolAccessMode from HttpRequest parameters. Default value is AUTHOR mode. - * - * @param request - * @return - */ - private ToolAccessMode getAccessMode(HttpServletRequest request) { - ToolAccessMode mode; - String modeStr = request.getParameter(AttributeNames.ATTR_MODE); - if (StringUtils.equalsIgnoreCase(modeStr, ToolAccessMode.TEACHER.toString())) { - mode = ToolAccessMode.TEACHER; - } else { - mode = ToolAccessMode.AUTHOR; - } - return mode; - } - private ActionMessages validate(TaskListForm taskListForm, ActionMapping mapping, HttpServletRequest request) { ActionMessages errors = new ActionMessages(); // if (StringUtils.isBlank(taskListForm.getTaskList().getTitle())) { Index: lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/web/AuthoringAction.java =================================================================== RCS file: /usr/local/cvsroot/lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/web/Attic/AuthoringAction.java,v diff -u -r1.1.2.3 -r1.1.2.4 --- lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/web/AuthoringAction.java 21 Dec 2016 05:34:04 -0000 1.1.2.3 +++ lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/web/AuthoringAction.java 30 Mar 2017 18:30:08 -0000 1.1.2.4 @@ -159,7 +159,7 @@ } voteAuthoringForm.setMaxInputs(new Short(maxInputs)); - ToolAccessMode mode = getAccessMode(request); + ToolAccessMode mode = WebUtil.readToolAccessModeAuthorDefaulted(request); request.setAttribute(AttributeNames.ATTR_MODE, mode.toString()); } @@ -757,7 +757,7 @@ } if (errors.isEmpty()) { - ToolAccessMode mode = getAccessMode(request); + ToolAccessMode mode = WebUtil.readToolAccessModeAuthorDefaulted(request); request.setAttribute(AttributeNames.ATTR_MODE, mode.toString()); List deletedQuestionDTOs = (List) sessionMap @@ -832,23 +832,6 @@ return mapping.findForward(VoteAppConstants.LOAD_QUESTIONS); } - /** - * Get ToolAccessMode from HttpRequest parameters. Default value is AUTHOR mode. - * - * @param request - * @return - */ - private ToolAccessMode getAccessMode(HttpServletRequest request) { - ToolAccessMode mode; - String modeStr = request.getParameter(AttributeNames.ATTR_MODE); - if (StringUtils.equalsIgnoreCase(modeStr, ToolAccessMode.TEACHER.toString())) { - mode = ToolAccessMode.TEACHER; - } else { - mode = ToolAccessMode.AUTHOR; - } - return mode; - } - public ActionForward start(ActionMapping mapping, ActionForm form, HttpServletRequest request, HttpServletResponse response) throws IOException, ServletException, VoteApplicationException { @@ -901,7 +884,7 @@ return mapping.findForward(VoteAppConstants.ERROR_LIST); } - ToolAccessMode mode = getAccessMode(request); + ToolAccessMode mode = WebUtil.readToolAccessModeAuthorDefaulted(request); // request is from monitoring module if (mode.isTeacher()) { VoteUtils.setDefineLater(request, true, strToolContentId, voteService); Index: lams_tool_wiki/src/java/org/lamsfoundation/lams/tool/wiki/web/actions/AuthoringAction.java =================================================================== RCS file: /usr/local/cvsroot/lams_tool_wiki/src/java/org/lamsfoundation/lams/tool/wiki/web/actions/AuthoringAction.java,v diff -u -r1.7.2.3 -r1.7.2.4 --- lams_tool_wiki/src/java/org/lamsfoundation/lams/tool/wiki/web/actions/AuthoringAction.java 11 May 2016 07:37:40 -0000 1.7.2.3 +++ lams_tool_wiki/src/java/org/lamsfoundation/lams/tool/wiki/web/actions/AuthoringAction.java 30 Mar 2017 18:31:03 -0000 1.7.2.4 @@ -95,7 +95,7 @@ String contentFolderID = WebUtil.readStrParam(request, AttributeNames.PARAM_CONTENT_FOLDER_ID); - ToolAccessMode mode = getAccessMode(request); + ToolAccessMode mode = WebUtil.readToolAccessModeAuthorDefaulted(request); // Set up the authForm. AuthoringForm authForm = (AuthoringForm) form; @@ -116,7 +116,7 @@ // TODO NOTE: this causes DB orphans when LD not saved. } - if (mode != null && mode.isTeacher()) { + if (mode.isTeacher()) { // Set the defineLater flag so that learners cannot use content // while we // are editing. This flag is released when updateContent is called. @@ -333,20 +333,6 @@ } /** - * Get ToolAccessMode from HttpRequest parameters. Default value is AUTHOR mode. - * - * @param request - * @return - */ - private ToolAccessMode getAccessMode(HttpServletRequest request) { - String modeStr = request.getParameter(AttributeNames.ATTR_MODE); - if (StringUtils.equalsIgnoreCase(modeStr, ToolAccessMode.TEACHER.toString())) { - return ToolAccessMode.TEACHER; - } - return ToolAccessMode.AUTHOR; - } - - /** * Retrieve the SessionMap from the HttpSession. * * @param request