Index: lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/web/controller/AuthoringController.java =================================================================== diff -u -rf2ad75cef0c507a64877942631fee13efbc6ed50 -r74f5ff6df21a1a43759c86c80b66b447fe48b8fb --- lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/web/controller/AuthoringController.java (.../AuthoringController.java) (revision f2ad75cef0c507a64877942631fee13efbc6ed50) +++ lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/web/controller/AuthoringController.java (.../AuthoringController.java) (revision 74f5ff6df21a1a43759c86c80b66b447fe48b8fb) @@ -26,6 +26,7 @@ import java.io.IOException; import java.io.UnsupportedEncodingException; import java.net.URLDecoder; +import java.net.URLEncoder; import java.sql.Timestamp; import java.util.ArrayList; import java.util.Date; @@ -45,6 +46,7 @@ import javax.servlet.http.HttpServletResponse; import org.apache.commons.beanutils.PropertyUtils; +import org.apache.commons.lang.StringUtils; import org.apache.commons.lang.math.NumberUtils; import org.apache.log4j.Logger; import org.lamsfoundation.lams.learningdesign.ToolActivity; @@ -206,6 +208,15 @@ .getPrecedingConfidenceLevelsActivities(contentId); sessionMap.put(ScratchieConstants.ATTR_CONFIDENCE_LEVELS_ACTIVITIES, confidenceLevelsActivities); + String notifyCloseURL = request.getParameter("notifyCloseURL"); + if (StringUtils.isNotBlank(notifyCloseURL)) { + try { + request.setAttribute("notifyCloseURL", URLEncoder.encode(notifyCloseURL, "UTF-8")); + } catch (UnsupportedEncodingException e) { + throw new ServletException("Exception while encoding notifyCloseURL: " + notifyCloseURL, e); + } + } + sessionMap.put(ScratchieConstants.ATTR_RESOURCE_FORM, authoringForm); return "pages/authoring/start"; } @@ -260,7 +271,7 @@ // initialize oldItems' answers for (ScratchieItem oldItem : oldItems) { - for (ScratchieAnswer answer : (Set) oldItem.getAnswers()) { + for (ScratchieAnswer answer : oldItem.getAnswers()) { } } Index: lams_tool_scratchie/web/pages/authoring/start.jsp =================================================================== diff -u -r60b108064c4a844e3f153a849ab51a14bc3a8488 -r74f5ff6df21a1a43759c86c80b66b447fe48b8fb --- lams_tool_scratchie/web/pages/authoring/start.jsp (.../start.jsp) (revision 60b108064c4a844e3f153a849ab51a14bc3a8488) +++ lams_tool_scratchie/web/pages/authoring/start.jsp (.../start.jsp) (revision 74f5ff6df21a1a43759c86c80b66b447fe48b8fb) @@ -4,7 +4,7 @@ - +