Index: lams_build/lib/lams/lams-central.jar =================================================================== diff -u -r29fac4bd0bdf28bcaaeee7aae4020ccb15b6e520 -rdfe9ef3dde4b722b5d87c4964a66f19fd48ea2b0 Binary files differ Index: lams_build/lib/lams/lams.jar =================================================================== diff -u -r29fac4bd0bdf28bcaaeee7aae4020ccb15b6e520 -rdfe9ef3dde4b722b5d87c4964a66f19fd48ea2b0 Binary files differ Index: lams_central/src/java/org/lamsfoundation/lams/authoring/service/AuthoringService.java =================================================================== diff -u -r29fac4bd0bdf28bcaaeee7aae4020ccb15b6e520 -rdfe9ef3dde4b722b5d87c4964a66f19fd48ea2b0 --- lams_central/src/java/org/lamsfoundation/lams/authoring/service/AuthoringService.java (.../AuthoringService.java) (revision 29fac4bd0bdf28bcaaeee7aae4020ccb15b6e520) +++ lams_central/src/java/org/lamsfoundation/lams/authoring/service/AuthoringService.java (.../AuthoringService.java) (revision dfe9ef3dde4b722b5d87c4964a66f19fd48ea2b0) @@ -1804,11 +1804,11 @@ return flashMessage.serializeMessage(); } - /** @see org.lamsfoundation.lams.authoring.service.IAuthoringService#generateToolContentID(java.lang.Long) */ + /** @see org.lamsfoundation.lams.authoring.service.IAuthoringService#insertToolContentID(java.lang.Long) */ @Override public String getToolContentIDFlash(Long toolID) throws IOException { - Long toolContentID = generateToolContentID(toolID); + Long toolContentID = insertToolContentID(toolID); if (toolContentID == null) { return FlashMessage.getNoSuchTool("getToolContentID", toolID).serializeMessage(); } @@ -1818,7 +1818,7 @@ } @Override - public Long generateToolContentID(Long toolID) { + public Long insertToolContentID(Long toolID) { Tool tool = toolDAO.getToolByID(toolID); if (tool == null) { log.error("The toolID " + toolID + " is not valid. A Tool with tool id " + toolID @@ -1973,7 +1973,7 @@ */ @Override @SuppressWarnings("unchecked") - public Long createSingleActivityLearningDesign(String learningDesignTitle, Long toolID, Long toolContentID, + public Long insertSingleActivityLearningDesign(String learningDesignTitle, Long toolID, Long toolContentID, String contentFolderID) { Integer userID = AuthoringService.getUserId(); User user = (User) baseDAO.find(User.class, userID); Index: lams_central/src/java/org/lamsfoundation/lams/authoring/service/IAuthoringService.java =================================================================== diff -u -r29fac4bd0bdf28bcaaeee7aae4020ccb15b6e520 -rdfe9ef3dde4b722b5d87c4964a66f19fd48ea2b0 --- lams_central/src/java/org/lamsfoundation/lams/authoring/service/IAuthoringService.java (.../IAuthoringService.java) (revision 29fac4bd0bdf28bcaaeee7aae4020ccb15b6e520) +++ lams_central/src/java/org/lamsfoundation/lams/authoring/service/IAuthoringService.java (.../IAuthoringService.java) (revision dfe9ef3dde4b722b5d87c4964a66f19fd48ea2b0) @@ -259,7 +259,7 @@ */ public String getToolContentIDFlash(Long toolID) throws IOException; - public Long generateToolContentID(Long toolID); + public Long insertToolContentID(Long toolID); /** * Calls an appropriate tool to copy the content indicated by toolContentId. Returns a string representing the new @@ -406,6 +406,6 @@ public String getToolAuthorUrl(Long toolID, Long toolContentID, String contentFolderID); - public Long createSingleActivityLearningDesign(String learningDesignTitle, Long toolID, Long toolContentID, + public Long insertSingleActivityLearningDesign(String learningDesignTitle, Long toolID, Long toolContentID, String contentFolderID); } \ No newline at end of file Index: lams_central/src/java/org/lamsfoundation/lams/authoring/web/AuthoringAction.java =================================================================== diff -u -r29fac4bd0bdf28bcaaeee7aae4020ccb15b6e520 -rdfe9ef3dde4b722b5d87c4964a66f19fd48ea2b0 --- lams_central/src/java/org/lamsfoundation/lams/authoring/web/AuthoringAction.java (.../AuthoringAction.java) (revision 29fac4bd0bdf28bcaaeee7aae4020ccb15b6e520) +++ lams_central/src/java/org/lamsfoundation/lams/authoring/web/AuthoringAction.java (.../AuthoringAction.java) (revision dfe9ef3dde4b722b5d87c4964a66f19fd48ea2b0) @@ -322,7 +322,7 @@ IAuthoringService authoringService = getAuthoringService(); Long toolID = WebUtil.readLongParam(request, AttributeNames.PARAM_TOOL_ID); // generate the next unique content ID for the tool - Long toolContentID = authoringService.generateToolContentID(toolID); + Long toolContentID = authoringService.insertToolContentID(toolID); if (toolContentID != null) { String contentFolderID = FileUtil.generateUniqueContentFolderID(); String authorUrl = authoringService.getToolAuthorUrl(toolID, toolContentID, contentFolderID); @@ -351,7 +351,7 @@ String contentFolderID = request.getParameter(AttributeNames.PARAM_CONTENT_FOLDER_ID); String learningDesignTitle = request.getParameter(AttributeNames.PARAM_TITLE); // created the LD - Long learningDesignID = authoringService.createSingleActivityLearningDesign(learningDesignTitle, toolID, + Long learningDesignID = authoringService.insertSingleActivityLearningDesign(learningDesignTitle, toolID, toolContentID, contentFolderID); if (learningDesignID != null) { Integer organisationID = WebUtil.readIntParam(request, AttributeNames.PARAM_ORGANISATION_ID); Index: lams_central/src/java/org/lamsfoundation/lams/authoring/web/LamsAuthoringFinishAction.java =================================================================== diff -u -rd646d3d1075cb13b89a87c07a118422112995162 -rdfe9ef3dde4b722b5d87c4964a66f19fd48ea2b0 --- lams_central/src/java/org/lamsfoundation/lams/authoring/web/LamsAuthoringFinishAction.java (.../LamsAuthoringFinishAction.java) (revision d646d3d1075cb13b89a87c07a118422112995162) +++ lams_central/src/java/org/lamsfoundation/lams/authoring/web/LamsAuthoringFinishAction.java (.../LamsAuthoringFinishAction.java) (revision dfe9ef3dde4b722b5d87c4964a66f19fd48ea2b0) @@ -74,7 +74,6 @@ private static final String RE_EDIT_URL = "reEditUrl"; private static final String PARAM_DEFINE_LATER = "defineLater"; - private static final String PARAM_NOTIFY_CLOSE_URL = "notifyCloseURL"; /** * Action method, will handle save/cancel action. @@ -84,7 +83,7 @@ String action = request.getParameter(ACTION_NAME); ToolAccessMode mode = WebUtil.readToolAccessModeParam(request, ACTION_MODE, false); String cSessionID = request.getParameter(CUSTOMISE_SESSION_ID); - String notifyCloseURL = (String) request.getSession().getAttribute(PARAM_NOTIFY_CLOSE_URL); + String notifyCloseURL = (String) request.getSession().getAttribute(AttributeNames.PARAM_NOTIFY_CLOSE_URL); // clear session according to the ToolAccessMode. clearSession(cSessionID, request.getSession(), mode); @@ -104,11 +103,12 @@ //add reeditUrl parameter String reeditUrl = WebUtil.appendParameterToURL(getLamsUrl() + tool.getAuthorUrl(), AttributeNames.PARAM_TOOL_CONTENT_ID, toolContentId.toString()); - reeditUrl = WebUtil.appendParameterToURL(reeditUrl, AttributeNames.PARAM_CONTENT_FOLDER_ID, contentFolderID); + reeditUrl = WebUtil + .appendParameterToURL(reeditUrl, AttributeNames.PARAM_CONTENT_FOLDER_ID, contentFolderID); nextUrl = WebUtil.appendParameterToURL(nextUrl, RE_EDIT_URL, URLEncoder.encode(reeditUrl, "UTF-8")); if (!StringUtils.isBlank(notifyCloseURL)) { - nextUrl = WebUtil.appendParameterToURL(nextUrl, PARAM_NOTIFY_CLOSE_URL, notifyCloseURL); + nextUrl = WebUtil.appendParameterToURL(nextUrl, AttributeNames.PARAM_NOTIFY_CLOSE_URL, notifyCloseURL); } response.sendRedirect(nextUrl); } Index: lams_central/src/java/org/lamsfoundation/lams/web/HomeAction.java =================================================================== diff -u -reb42380458dff71406b1964f915d8428a4bf2a2e -rdfe9ef3dde4b722b5d87c4964a66f19fd48ea2b0 --- lams_central/src/java/org/lamsfoundation/lams/web/HomeAction.java (.../HomeAction.java) (revision eb42380458dff71406b1964f915d8428a4bf2a2e) +++ lams_central/src/java/org/lamsfoundation/lams/web/HomeAction.java (.../HomeAction.java) (revision dfe9ef3dde4b722b5d87c4964a66f19fd48ea2b0) @@ -255,7 +255,7 @@ req.setAttribute("serverUrl", serverUrl); String requestSrc = req.getParameter("requestSrc"); - String notifyCloseURL = req.getParameter("notifyCloseURL"); + String notifyCloseURL = req.getParameter(AttributeNames.PARAM_NOTIFY_CLOSE_URL); String isPostMessageToParent = req.getParameter("isPostMessageToParent"); String customCSV = req.getParameter(AttributeNames.PARAM_CUSTOM_CSV); String extLmsId = req.getParameter(AttributeNames.PARAM_EXT_LMS_ID); @@ -281,7 +281,7 @@ } req.setAttribute("requestSrc", requestSrc); - req.setAttribute("notifyCloseURL", notifyCloseURL); + req.setAttribute(AttributeNames.PARAM_NOTIFY_CLOSE_URL, notifyCloseURL); req.setAttribute("isPostMessageToParent", isPostMessageToParent); req.setAttribute(AttributeNames.PARAM_CUSTOM_CSV, customCSV); req.setAttribute(AttributeNames.PARAM_EXT_LMS_ID, extLmsId); Index: lams_central/src/java/org/lamsfoundation/lams/web/planner/PedagogicalPlannerAction.java =================================================================== diff -u -r618d085276aecaf80d2562c08b544636bcb5b9e0 -rdfe9ef3dde4b722b5d87c4964a66f19fd48ea2b0 --- lams_central/src/java/org/lamsfoundation/lams/web/planner/PedagogicalPlannerAction.java (.../PedagogicalPlannerAction.java) (revision 618d085276aecaf80d2562c08b544636bcb5b9e0) +++ lams_central/src/java/org/lamsfoundation/lams/web/planner/PedagogicalPlannerAction.java (.../PedagogicalPlannerAction.java) (revision dfe9ef3dde4b722b5d87c4964a66f19fd48ea2b0) @@ -240,7 +240,6 @@ // Parameters public static final String PARAM_REQUEST_SRC = "requestSrc"; - public static final String PARAM_NOTIFY_CLOSE_URL = "notifyCloseURL"; public static final String PARAM_FORBID_BUTTONS = "forbidButtons"; public static final String PARAM_RETURN_TO_PARENT = "returnToParent"; @@ -290,9 +289,9 @@ if (StringUtils.isNotBlank(requestSrc)) { request.getSession().setAttribute(PARAM_REQUEST_SRC, requestSrc); } - String notifyCloseURL = request.getParameter(PARAM_NOTIFY_CLOSE_URL); + String notifyCloseURL = request.getParameter(AttributeNames.PARAM_NOTIFY_CLOSE_URL); if (StringUtils.isNotBlank(notifyCloseURL)) { - request.getSession().setAttribute(PARAM_NOTIFY_CLOSE_URL, notifyCloseURL); + request.getSession().setAttribute(AttributeNames.PARAM_NOTIFY_CLOSE_URL, notifyCloseURL); } return openSequenceNode(mapping, form, request, response); @@ -365,9 +364,9 @@ if (StringUtils.isNotBlank(requestSrc)) { request.getSession().setAttribute(PARAM_REQUEST_SRC, requestSrc); } - String notifyCloseURL = request.getParameter(PARAM_NOTIFY_CLOSE_URL); + String notifyCloseURL = request.getParameter(AttributeNames.PARAM_NOTIFY_CLOSE_URL); if (StringUtils.isNotBlank(notifyCloseURL)) { - request.getSession().setAttribute(PARAM_NOTIFY_CLOSE_URL, notifyCloseURL); + request.getSession().setAttribute(AttributeNames.PARAM_NOTIFY_CLOSE_URL, notifyCloseURL); } return mapping.findForward(PedagogicalPlannerAction.FORWARD_TEMPLATE); Index: lams_central/src/java/org/lamsfoundation/lams/web/tag/HelpTag.java =================================================================== diff -u -r4f68a533e24967e0185132c5e361a8a054f43941 -rdfe9ef3dde4b722b5d87c4964a66f19fd48ea2b0 --- lams_central/src/java/org/lamsfoundation/lams/web/tag/HelpTag.java (.../HelpTag.java) (revision 4f68a533e24967e0185132c5e361a8a054f43941) +++ lams_central/src/java/org/lamsfoundation/lams/web/tag/HelpTag.java (.../HelpTag.java) (revision dfe9ef3dde4b722b5d87c4964a66f19fd48ea2b0) @@ -23,199 +23,198 @@ package org.lamsfoundation.lams.web.tag; import java.io.IOException; -import java.lang.NullPointerException; import java.util.Locale; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpSession; import javax.servlet.jsp.JspException; import javax.servlet.jsp.JspWriter; +import javax.servlet.jsp.tagext.Tag; import javax.servlet.jsp.tagext.TagSupport; import org.apache.commons.lang.StringUtils; import org.apache.log4j.Logger; - import org.lamsfoundation.lams.authoring.web.AuthoringConstants; -import org.lamsfoundation.lams.tool.service.*; import org.lamsfoundation.lams.tool.IToolVO; -import org.lamsfoundation.lams.web.filter.LocaleFilter; +import org.lamsfoundation.lams.tool.service.ILamsToolService; import org.lamsfoundation.lams.util.Configuration; import org.lamsfoundation.lams.util.ConfigurationKeys; import org.lamsfoundation.lams.util.HelpUtil; +import org.lamsfoundation.lams.web.filter.LocaleFilter; import org.springframework.web.context.WebApplicationContext; import org.springframework.web.context.support.WebApplicationContextUtils; /** * Generates a help link to a contextualised tool help page. * - * @jsp.tag name="help" - * body-content="empty" - * display-name="Help tag" - * description="Help tag" - * + * @jsp.tag name="help" body-content="empty" display-name="Help tag" description="Help tag" + * * @author Fiona Malikoff */ public class HelpTag extends TagSupport { - private static final Logger log = Logger.getLogger(HelpTag.class); - private String module = null; - private String page = null; - private String toolSignature = null; - private String style = null; - - /** + private static final Logger log = Logger.getLogger(HelpTag.class); + private String module = null; + private String page = null; + private String toolSignature = null; + private String style = null; + + /** * */ - public HelpTag() { - super(); - } - - public int doStartTag() throws JspException { - try { - - int imgHeight = 25; - boolean div = true; - - JspWriter writer = pageContext.getOut(); - if (StringUtils.equals(style, "no-tabs")) { - writer.println("
"); - } else if (StringUtils.equals(style, "small")) { - imgHeight = 18; - div = false; - } else { - writer.println("
"); - } - try { - - HttpSession session = ((HttpServletRequest) this.pageContext.getRequest()).getSession(); - Locale locale = (Locale) session.getAttribute(LocaleFilter.PREFERRED_LOCALE_KEY); - String languageCode = locale != null ? locale.getLanguage() : ""; - - if(toolSignature != null && module != null) { - - // retrieve help URL for tool - ILamsToolService toolService = (ILamsToolService) getContext().getBean(AuthoringConstants.TOOL_SERVICE_BEAN_NAME); - IToolVO tool = toolService.getToolBySignature(toolSignature); + public HelpTag() { + super(); + } - String fullURL = HelpUtil.constructToolURL(tool.getHelpUrl(), toolSignature, module, languageCode ); - - if(fullURL == null) - return SKIP_BODY; - - writer.println(""); + @Override + public int doStartTag() throws JspException { + try { - - } else if(page != null){ - - String fullURL = HelpUtil.constructPageURL(page, languageCode); + int imgHeight = 25; + boolean div = true; - writer.println(""); + JspWriter writer = pageContext.getOut(); + if (StringUtils.equals(style, "no-tabs")) { + writer.println("
"); + } else if (StringUtils.equals(style, "small")) { + imgHeight = 18; + div = false; + } else { + writer.println("
"); + } + try { - } else { - log.error("HelpTag unable to write out due to unspecified values."); - writer.println(""); - } - } catch (NullPointerException npe) { - log.error("HelpTag unable to write out due to NullPointerException. Most likely a required paramater was unspecified or incorrect.", npe); - // don't throw a JSPException as we want the system to still function. + HttpSession session = ((HttpServletRequest) this.pageContext.getRequest()).getSession(); + Locale locale = (Locale) session.getAttribute(LocaleFilter.PREFERRED_LOCALE_KEY); + String languageCode = locale != null ? locale.getLanguage() : ""; - } - - if ( div ) - writer.println("
"); - - } catch (IOException e) { - log.error("HelpTag unable to write out due to IOException.", e); - // don't throw a JSPException as we want the system to still function. + if ((toolSignature != null) && (module != null)) { + + // retrieve help URL for tool + ILamsToolService toolService = (ILamsToolService) getContext().getBean( + AuthoringConstants.TOOL_SERVICE_BEAN_NAME); + IToolVO tool = toolService.getToolBySignature(toolSignature); + + String fullURL = HelpUtil.constructToolURL(tool.getHelpUrl(), toolSignature, module, languageCode); + + if (fullURL == null) { + return Tag.SKIP_BODY; + } + + writer.println(""); + + } else if (page != null) { + + String fullURL = HelpUtil.constructPageURL(page, languageCode); + + writer.println(""); + + } else { + HelpTag.log.error("HelpTag unable to write out due to unspecified values."); + writer.println(""); } - return SKIP_BODY; - } + } catch (NullPointerException npe) { + HelpTag.log + .error("HelpTag unable to write out due to NullPointerException. Most likely a required paramater was unspecified or incorrect.", + npe); + // don't throw a JSPException as we want the system to still function. - public int doEndTag() { - return EVAL_PAGE; - } - /** - * @return module - * - * @jsp.attribute required="false" - * rtexprvalue="true" - * description="Module Name" - */ - public String getModule() { - return module; - } - - /** - * - * @param module - */ - public void setModule(String module) { - this.module = module; - } - - private WebApplicationContext getContext() { - WebApplicationContext ctx = WebApplicationContextUtils.getRequiredWebApplicationContext( pageContext.getServletContext()); - return ctx; - } - - /** - * @return - * - * @jsp.attribute required="false" - * rtexprvalue="true" - * description="Tool Signature" - */ - public String getToolSignature() { - return toolSignature; - } - - /** - * - * @param toolSignature - */ - public void setToolSignature(String toolSignature) { - this.toolSignature = toolSignature; - } - - /** - * @return page - * - * @jsp.attribute required="false" - * rtexprvalue="true" - * description="Page Name" - */ - public String getPage() { - return module; - } - - /** - * - * @param page - */ - public void setPage(String page) { - this.page = page; - } + } - /** - * @return style - * - * @jsp.attribute required="false" - * rtexprvalue="true" - * description="Style" - */ - public String getStyle() { - return style; + if (div) { + writer.println("
"); + } + + } catch (IOException e) { + HelpTag.log.error("HelpTag unable to write out due to IOException.", e); + // don't throw a JSPException as we want the system to still function. } - - /** - * - * @param style - */ - public void setStyle(String style) { - this.style = style; - } - + return Tag.SKIP_BODY; + } + + @Override + public int doEndTag() { + return Tag.EVAL_PAGE; + } + + /** + * @return module + * + * @jsp.attribute required="false" rtexprvalue="true" description="Module Name" + */ + public String getModule() { + return module; + } + + /** + * + * @param module + */ + public void setModule(String module) { + this.module = module; + } + + private WebApplicationContext getContext() { + WebApplicationContext ctx = WebApplicationContextUtils.getRequiredWebApplicationContext(pageContext + .getServletContext()); + return ctx; + } + + /** + * @return + * + * @jsp.attribute required="false" rtexprvalue="true" description="Tool Signature" + */ + public String getToolSignature() { + return toolSignature; + } + + /** + * + * @param toolSignature + */ + public void setToolSignature(String toolSignature) { + this.toolSignature = toolSignature; + } + + /** + * @return page + * + * @jsp.attribute required="false" rtexprvalue="true" description="Page Name" + */ + public String getPage() { + return module; + } + + /** + * + * @param page + */ + public void setPage(String page) { + this.page = page; + } + + /** + * @return style + * + * @jsp.attribute required="false" rtexprvalue="true" description="Style" + */ + public String getStyle() { + return style; + } + + /** + * + * @param style + */ + public void setStyle(String style) { + this.style = style; + } + } Index: lams_central/web/authoringConfirm.jsp =================================================================== diff -u -reb405013b9e11e0e46c4da1ce67179523aa39413 -rdfe9ef3dde4b722b5d87c4964a66f19fd48ea2b0 --- lams_central/web/authoringConfirm.jsp (.../authoringConfirm.jsp) (revision eb405013b9e11e0e46c4da1ce67179523aa39413) +++ lams_central/web/authoringConfirm.jsp (.../authoringConfirm.jsp) (revision dfe9ef3dde4b722b5d87c4964a66f19fd48ea2b0) @@ -21,7 +21,7 @@ refreshParentMonitoringWindow(); } else { if (window.parent.opener == null || '${param.noopener}' == 'true' || notifyCloseURL.indexOf('noopener=true') >= 0){ - window.location.href = notifyCloseURL; + window.location.href = notifyCloseURL + '&action=save'; } else { window.parent.opener.location.href = notifyCloseURL; } Index: lams_central/web/dialogCloser.jsp =================================================================== diff -u --- lams_central/web/dialogCloser.jsp (revision 0) +++ lams_central/web/dialogCloser.jsp (revision dfe9ef3dde4b722b5d87c4964a66f19fd48ea2b0) @@ -0,0 +1,10 @@ +<%@ page language="java" pageEncoding="UTF-8" contentType="text/html;charset=utf-8"%> + + + + + + + \ No newline at end of file Index: lams_common/src/java/org/lamsfoundation/lams/integration/util/LoginRequestDispatcher.java =================================================================== diff -u -r08033b2bf54b7ca227bc32a1cb277936769d7aae -rdfe9ef3dde4b722b5d87c4964a66f19fd48ea2b0 --- lams_common/src/java/org/lamsfoundation/lams/integration/util/LoginRequestDispatcher.java (.../LoginRequestDispatcher.java) (revision 08033b2bf54b7ca227bc32a1cb277936769d7aae) +++ lams_common/src/java/org/lamsfoundation/lams/integration/util/LoginRequestDispatcher.java (.../LoginRequestDispatcher.java) (revision dfe9ef3dde4b722b5d87c4964a66f19fd48ea2b0) @@ -34,6 +34,7 @@ import org.lamsfoundation.lams.integration.service.IntegrationService; import org.lamsfoundation.lams.lesson.service.ILessonService; import org.lamsfoundation.lams.usermanagement.User; +import org.lamsfoundation.lams.web.util.AttributeNames; import org.springframework.web.context.support.WebApplicationContextUtils; /** @@ -61,8 +62,6 @@ public static final String PARAM_REQUEST_SRC = "requestSrc"; - public static final String PARAM_NOTIFY_CLOSE_URL = "notifyCloseURL"; - public static final String PARAM_IS_POST_MESSAGE_TO_PARENT = "isPostMessageToParent"; public static final String PARAM_FIRST_NAME = "firstName"; @@ -129,7 +128,7 @@ /** AUTHOR * */ else if (METHOD_AUTHOR.equals(method)) { String requestSrc = request.getParameter(PARAM_REQUEST_SRC); - String notifyCloseURL = request.getParameter(PARAM_NOTIFY_CLOSE_URL); + String notifyCloseURL = request.getParameter(AttributeNames.PARAM_NOTIFY_CLOSE_URL); String isPostMessageToParent = request.getParameter(PARAM_IS_POST_MESSAGE_TO_PARENT); // Custom CSV string to be used for tool adapters @@ -144,7 +143,7 @@ parameters = extLmsId != null ? parameters + "&" + PARAM_EXT_LMS_ID + "=" + extLmsId : parameters; parameters = requestSrc != null ? parameters + "&" + PARAM_REQUEST_SRC + "=" + URLEncoder.encode(requestSrc, "UTF8") : parameters; - parameters = notifyCloseURL != null ? parameters + "&" + PARAM_NOTIFY_CLOSE_URL + "=" + parameters = notifyCloseURL != null ? parameters + "&" + AttributeNames.PARAM_NOTIFY_CLOSE_URL + "=" + URLEncoder.encode(notifyCloseURL, "UTF8") : parameters; parameters = isPostMessageToParent != null ? parameters + "&" + PARAM_IS_POST_MESSAGE_TO_PARENT + "=" + isPostMessageToParent : parameters; } catch (UnsupportedEncodingException e) { Index: lams_common/src/java/org/lamsfoundation/lams/toolApplicationContext.xml =================================================================== diff -u -r2f21856ec2ab85b47c93cfcc3fa2c8769be65077 -rdfe9ef3dde4b722b5d87c4964a66f19fd48ea2b0 --- lams_common/src/java/org/lamsfoundation/lams/toolApplicationContext.xml (.../toolApplicationContext.xml) (revision 2f21856ec2ab85b47c93cfcc3fa2c8769be65077) +++ lams_common/src/java/org/lamsfoundation/lams/toolApplicationContext.xml (.../toolApplicationContext.xml) (revision dfe9ef3dde4b722b5d87c4964a66f19fd48ea2b0) @@ -72,7 +72,7 @@ PROPAGATION_REQUIRED - PROPAGATION_REQUIRED,readOnly + PROPAGATION_REQUIRED Index: lams_common/src/java/org/lamsfoundation/lams/web/util/AttributeNames.java =================================================================== diff -u -r29fac4bd0bdf28bcaaeee7aae4020ccb15b6e520 -rdfe9ef3dde4b722b5d87c4964a66f19fd48ea2b0 --- lams_common/src/java/org/lamsfoundation/lams/web/util/AttributeNames.java (.../AttributeNames.java) (revision 29fac4bd0bdf28bcaaeee7aae4020ccb15b6e520) +++ lams_common/src/java/org/lamsfoundation/lams/web/util/AttributeNames.java (.../AttributeNames.java) (revision dfe9ef3dde4b722b5d87c4964a66f19fd48ea2b0) @@ -74,6 +74,7 @@ public static final String PARAM_CUSTOM_CSV = "customCSV"; public static final String PARAM_EXT_LMS_ID = "extlmsid"; public static final String PARAM_CREATE_DATE_TIME = "createDateTime"; + public static final String PARAM_NOTIFY_CLOSE_URL = "notifyCloseURL"; public static final String PARAM_LIB = "library"; Index: lams_tool_assessment/web/pages/authoring/parts/overallfeedbacklist.jsp =================================================================== diff -u -r29fac4bd0bdf28bcaaeee7aae4020ccb15b6e520 -rdfe9ef3dde4b722b5d87c4964a66f19fd48ea2b0 --- lams_tool_assessment/web/pages/authoring/parts/overallfeedbacklist.jsp (.../overallfeedbacklist.jsp) (revision 29fac4bd0bdf28bcaaeee7aae4020ccb15b6e520) +++ lams_tool_assessment/web/pages/authoring/parts/overallfeedbacklist.jsp (.../overallfeedbacklist.jsp) (revision dfe9ef3dde4b722b5d87c4964a66f19fd48ea2b0) @@ -99,9 +99,12 @@ <%-- This script will adjust assessment item input area height according to the new instruction item amount. --%> Index: lams_tool_daco/web/pages/authoring/parts/questionlist.jsp =================================================================== diff -u -r29fac4bd0bdf28bcaaeee7aae4020ccb15b6e520 -rdfe9ef3dde4b722b5d87c4964a66f19fd48ea2b0 --- lams_tool_daco/web/pages/authoring/parts/questionlist.jsp (.../questionlist.jsp) (revision 29fac4bd0bdf28bcaaeee7aae4020ccb15b6e520) +++ lams_tool_daco/web/pages/authoring/parts/questionlist.jsp (.../questionlist.jsp) (revision dfe9ef3dde4b722b5d87c4964a66f19fd48ea2b0) @@ -71,7 +71,7 @@ var win = window.hideMessage ? window : window.top; if (win.hideMessage != null){ win.hideQuestionInputArea(); - var obj = win..document.getElementById('questionListArea'); + var obj = win.document.getElementById('questionListArea'); obj.innerHTML= document.getElementById("questionList").innerHTML; } \ No newline at end of file Index: lams_tool_eadventure/src/java/org/eucm/lams/tool/eadventure/web/action/AuthoringAction.java =================================================================== diff -u -r7322054ababd8f5387c3424cdd38d99c3ab49e02 -rdfe9ef3dde4b722b5d87c4964a66f19fd48ea2b0 --- lams_tool_eadventure/src/java/org/eucm/lams/tool/eadventure/web/action/AuthoringAction.java (.../AuthoringAction.java) (revision 7322054ababd8f5387c3424cdd38d99c3ab49e02) +++ lams_tool_eadventure/src/java/org/eucm/lams/tool/eadventure/web/action/AuthoringAction.java (.../AuthoringAction.java) (revision dfe9ef3dde4b722b5d87c4964a66f19fd48ea2b0) @@ -285,6 +285,8 @@ sessionMap.put(EadventureConstants.ATTR_CHANGE_FILE, "false"); sessionMap.put(EadventureConstants.ATTR_RESOURCE_FORM, eadventureForm); + request.getSession().setAttribute(AttributeNames.PARAM_NOTIFY_CLOSE_URL, + request.getParameter(AttributeNames.PARAM_NOTIFY_CLOSE_URL)); return mapping.findForward(EadventureConstants.SUCCESS); } Index: lams_tool_images/src/java/org/lamsfoundation/lams/tool/imageGallery/web/action/AuthoringAction.java =================================================================== diff -u -r616336eff87580ecb6f13770899bc9af7eff4fa8 -rdfe9ef3dde4b722b5d87c4964a66f19fd48ea2b0 --- lams_tool_images/src/java/org/lamsfoundation/lams/tool/imageGallery/web/action/AuthoringAction.java (.../AuthoringAction.java) (revision 616336eff87580ecb6f13770899bc9af7eff4fa8) +++ lams_tool_images/src/java/org/lamsfoundation/lams/tool/imageGallery/web/action/AuthoringAction.java (.../AuthoringAction.java) (revision dfe9ef3dde4b722b5d87c4964a66f19fd48ea2b0) @@ -243,6 +243,8 @@ sessionMap.put(ImageGalleryConstants.ATTR_RESOURCE_FORM, imageGalleryForm); sessionMap.put(ImageGalleryConstants.ATTR_NEXT_IMAGE_TITLE, imageGallery.getNextImageTitle()); + request.getSession().setAttribute(AttributeNames.PARAM_NOTIFY_CLOSE_URL, + request.getParameter(AttributeNames.PARAM_NOTIFY_CLOSE_URL)); return mapping.findForward(ImageGalleryConstants.SUCCESS); } Index: lams_tool_imscc/src/java/org/lamsfoundation/lams/tool/commonCartridge/web/action/AuthoringAction.java =================================================================== diff -u -r4dba5dfd3c1a3802a3354b772a8449378d1dc3b5 -rdfe9ef3dde4b722b5d87c4964a66f19fd48ea2b0 --- lams_tool_imscc/src/java/org/lamsfoundation/lams/tool/commonCartridge/web/action/AuthoringAction.java (.../AuthoringAction.java) (revision 4dba5dfd3c1a3802a3354b772a8449378d1dc3b5) +++ lams_tool_imscc/src/java/org/lamsfoundation/lams/tool/commonCartridge/web/action/AuthoringAction.java (.../AuthoringAction.java) (revision dfe9ef3dde4b722b5d87c4964a66f19fd48ea2b0) @@ -434,6 +434,8 @@ commonCartridgeItemList.addAll(items); sessionMap.put(CommonCartridgeConstants.ATTR_RESOURCE_FORM, commonCartridgeForm); + request.getSession().setAttribute(AttributeNames.PARAM_NOTIFY_CLOSE_URL, + request.getParameter(AttributeNames.PARAM_NOTIFY_CLOSE_URL)); return mapping.findForward(CommonCartridgeConstants.SUCCESS); } Index: lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/web/action/AuthoringAction.java =================================================================== diff -u -rfd8292deb95c595b3d948e003dd9ff1807f7b569 -rdfe9ef3dde4b722b5d87c4964a66f19fd48ea2b0 --- lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/web/action/AuthoringAction.java (.../AuthoringAction.java) (revision fd8292deb95c595b3d948e003dd9ff1807f7b569) +++ lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/web/action/AuthoringAction.java (.../AuthoringAction.java) (revision dfe9ef3dde4b722b5d87c4964a66f19fd48ea2b0) @@ -472,6 +472,8 @@ } sessionMap.put(ResourceConstants.ATTR_RESOURCE_FORM, resourceForm); + request.getSession().setAttribute(AttributeNames.PARAM_NOTIFY_CLOSE_URL, + request.getParameter(AttributeNames.PARAM_NOTIFY_CLOSE_URL)); return mapping.findForward(ResourceConstants.SUCCESS); } Index: lams_tool_spreadsheet/src/java/org/lamsfoundation/lams/tool/spreadsheet/web/action/AuthoringAction.java =================================================================== diff -u -re044a561b88b3eb68dc50846451a30d258108e0f -rdfe9ef3dde4b722b5d87c4964a66f19fd48ea2b0 --- lams_tool_spreadsheet/src/java/org/lamsfoundation/lams/tool/spreadsheet/web/action/AuthoringAction.java (.../AuthoringAction.java) (revision e044a561b88b3eb68dc50846451a30d258108e0f) +++ lams_tool_spreadsheet/src/java/org/lamsfoundation/lams/tool/spreadsheet/web/action/AuthoringAction.java (.../AuthoringAction.java) (revision dfe9ef3dde4b722b5d87c4964a66f19fd48ea2b0) @@ -168,6 +168,8 @@ } sessionMap.put(SpreadsheetConstants.ATTR_RESOURCE_FORM, spreadsheetForm); + request.getSession().setAttribute(AttributeNames.PARAM_NOTIFY_CLOSE_URL, + request.getParameter(AttributeNames.PARAM_NOTIFY_CLOSE_URL)); return mapping.findForward(SpreadsheetConstants.SUCCESS); } Index: lams_tool_survey/src/java/org/lamsfoundation/lams/tool/survey/web/action/AuthoringAction.java =================================================================== diff -u -r1aea223e6eb2cd1d28e948bcb8f2a7f104337b1c -rdfe9ef3dde4b722b5d87c4964a66f19fd48ea2b0 --- lams_tool_survey/src/java/org/lamsfoundation/lams/tool/survey/web/action/AuthoringAction.java (.../AuthoringAction.java) (revision 1aea223e6eb2cd1d28e948bcb8f2a7f104337b1c) +++ lams_tool_survey/src/java/org/lamsfoundation/lams/tool/survey/web/action/AuthoringAction.java (.../AuthoringAction.java) (revision dfe9ef3dde4b722b5d87c4964a66f19fd48ea2b0) @@ -496,6 +496,8 @@ conditionSet.addAll(survey.getConditions()); sessionMap.put(SurveyConstants.ATTR_SURVEY_FORM, surveyForm); + request.getSession().setAttribute(AttributeNames.PARAM_NOTIFY_CLOSE_URL, + request.getParameter(AttributeNames.PARAM_NOTIFY_CLOSE_URL)); return mapping.findForward(SurveyConstants.SUCCESS); } Index: lams_tool_task/src/java/org/lamsfoundation/lams/tool/taskList/web/action/AuthoringAction.java =================================================================== diff -u -rfd8292deb95c595b3d948e003dd9ff1807f7b569 -rdfe9ef3dde4b722b5d87c4964a66f19fd48ea2b0 --- lams_tool_task/src/java/org/lamsfoundation/lams/tool/taskList/web/action/AuthoringAction.java (.../AuthoringAction.java) (revision fd8292deb95c595b3d948e003dd9ff1807f7b569) +++ lams_tool_task/src/java/org/lamsfoundation/lams/tool/taskList/web/action/AuthoringAction.java (.../AuthoringAction.java) (revision dfe9ef3dde4b722b5d87c4964a66f19fd48ea2b0) @@ -259,6 +259,8 @@ taskListItemList.addAll(items); sessionMap.put(TaskListConstants.ATTR_RESOURCE_FORM, taskListForm); + request.getSession().setAttribute(AttributeNames.PARAM_NOTIFY_CLOSE_URL, + request.getParameter(AttributeNames.PARAM_NOTIFY_CLOSE_URL)); return mapping.findForward(TaskListConstants.SUCCESS); }