Index: lams_learning/src/java/org/lamsfoundation/lams/learning/export/web/action/ExportPortfolioAction.java =================================================================== diff -u -rbea2ce66bf349223a9f9be5c10cdd606f8cd55c5 -r3b51ef088374cf5691c557aa6bffffec2cf516ef --- lams_learning/src/java/org/lamsfoundation/lams/learning/export/web/action/ExportPortfolioAction.java (.../ExportPortfolioAction.java) (revision bea2ce66bf349223a9f9be5c10cdd606f8cd55c5) +++ lams_learning/src/java/org/lamsfoundation/lams/learning/export/web/action/ExportPortfolioAction.java (.../ExportPortfolioAction.java) (revision 3b51ef088374cf5691c557aa6bffffec2cf516ef) @@ -29,6 +29,7 @@ import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; +import javax.servlet.http.Cookie; import org.apache.struts.action.ActionForm; import org.apache.struts.action.ActionMapping; @@ -62,7 +63,8 @@ * ------------------------------------------------- **/ -public class ExportPortfolioAction extends LamsAction{ +public class ExportPortfolioAction extends LamsAction { + public final String PARAM_PORTFOLIO_LIST = "portfolioList"; public ActionForward execute(ActionMapping mapping, @@ -74,14 +76,17 @@ String mode = WebUtil.readStrParam(request, WebUtil.PARAM_MODE); IExportPortfolioService exportService = ExportPortfolioServiceProxy.getExportPortfolioService(getServlet().getServletContext()); + //get the cookies that came along with the request and pass it onto export service method + Cookie[] cookies = request.getCookies(); + if (mode.equals(ToolAccessMode.LEARNER.toString())) { //get the learnerprogress id User learner = LearningWebUtil.getUserData(request, getServlet().getServletContext()); LearnerProgress learnerProgress = LearningWebUtil.getLearnerProgressByUser(request, getServlet().getServletContext()); Long progressId = learnerProgress.getLearnerProgressId(); - portfolios = exportService.exportPortfolioForStudent(progressId, learner, true); + portfolios = exportService.exportPortfolioForStudent(progressId, learner, true, cookies); } else if(mode.equals(ToolAccessMode.TEACHER.toString())) { @@ -91,7 +96,7 @@ ILearnerService learnerService = LearnerServiceProxy.getLearnerService(getServlet().getServletContext()); Lesson lesson = learnerService.getLesson(lessonID); - portfolios = exportService.exportPortfolioForTeacher(lesson); + portfolios = exportService.exportPortfolioForTeacher(lesson, cookies); } request.setAttribute(PARAM_PORTFOLIO_LIST, portfolios);