Index: lams_central/src/java/org/lamsfoundation/lams/authoring/web/ExportToolContentAction.java =================================================================== diff -u -r6e8ba0f3a63271750e8db1ea6e194fdfb2b28d1a -r35b4130775d2a89a7267b4cbf13403905a4e2063 --- lams_central/src/java/org/lamsfoundation/lams/authoring/web/ExportToolContentAction.java (.../ExportToolContentAction.java) (revision 6e8ba0f3a63271750e8db1ea6e194fdfb2b28d1a) +++ lams_central/src/java/org/lamsfoundation/lams/authoring/web/ExportToolContentAction.java (.../ExportToolContentAction.java) (revision 35b4130775d2a89a7267b4cbf13403905a4e2063) @@ -85,10 +85,10 @@ Long learningDesignId = WebUtil.readLongParam(request,PARAM_LEARING_DESIGN_ID); IExportToolContentService service = getExportService(); List ldErrorMsgs = new ArrayList(); + List toolsErrorMsgs = new ArrayList(); try { - List toolsErrorMsgs = new ArrayList(); String zipFilename = service.exportLearningDesign(learningDesignId,toolsErrorMsgs); - request.setAttribute(ATTR_TOOLS_ERROR_MESSAGE,toolsErrorMsgs); + //write zip file as response stream. response.setContentType("application/zip"); response.setHeader("Content-Disposition","attachment;filename="+FileUtil.getFileName(zipFilename)); @@ -125,6 +125,7 @@ } catch (Exception e1) { log.error("Unable to export tool content: " + e1.toString()); request.setAttribute(ATTR_LD_ERROR_MESSAGE,ldErrorMsgs); + request.setAttribute(ATTR_TOOLS_ERROR_MESSAGE,toolsErrorMsgs); } //display initial page for upload return mapping.findForward("result"); Index: lams_central/web/toolcontent/exportresult.jsp =================================================================== diff -u -re86dbe041f3f00144c4bde4943e17145eca786e2 -r35b4130775d2a89a7267b4cbf13403905a4e2063 --- lams_central/web/toolcontent/exportresult.jsp (.../exportresult.jsp) (revision e86dbe041f3f00144c4bde4943e17145eca786e2) +++ lams_central/web/toolcontent/exportresult.jsp (.../exportresult.jsp) (revision 35b4130775d2a89a7267b4cbf13403905a4e2063) @@ -29,10 +29,10 @@ -

${toolError}

Index: lams_central/web/toolcontent/import.jsp =================================================================== diff -u -re86dbe041f3f00144c4bde4943e17145eca786e2 -r35b4130775d2a89a7267b4cbf13403905a4e2063 --- lams_central/web/toolcontent/import.jsp (.../import.jsp) (revision e86dbe041f3f00144c4bde4943e17145eca786e2) +++ lams_central/web/toolcontent/import.jsp (.../import.jsp) (revision 35b4130775d2a89a7267b4cbf13403905a4e2063) @@ -17,36 +17,46 @@ -

- -

+ -

- -

- +

+ +

- - - - -

+ - - +

+ +

+ + +

+ + + + + + +

+ + + +