Index: lams_central/src/java/org/lamsfoundation/lams/authoring/web/AuthoringAction.java =================================================================== diff -u -ra3575b0a7c6e3be575c7c4d240eeeb4bee72a0fc -rc2d16fd7c49411c4c2c6da861cb880772eb45271 --- lams_central/src/java/org/lamsfoundation/lams/authoring/web/AuthoringAction.java (.../AuthoringAction.java) (revision a3575b0a7c6e3be575c7c4d240eeeb4bee72a0fc) +++ lams_central/src/java/org/lamsfoundation/lams/authoring/web/AuthoringAction.java (.../AuthoringAction.java) (revision c2d16fd7c49411c4c2c6da861cb880772eb45271) @@ -30,17 +30,20 @@ import javax.servlet.ServletException; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; +import javax.servlet.http.HttpSession; import org.apache.log4j.Logger; import org.apache.struts.action.ActionForm; import org.apache.struts.action.ActionForward; import org.apache.struts.action.ActionMapping; import org.lamsfoundation.lams.authoring.service.IAuthoringService; +import org.lamsfoundation.lams.usermanagement.dto.UserDTO; import org.lamsfoundation.lams.util.FileUtilException; import org.lamsfoundation.lams.util.WebUtil; import org.lamsfoundation.lams.util.audit.IAuditService; import org.lamsfoundation.lams.util.wddx.FlashMessage; import org.lamsfoundation.lams.web.action.LamsDispatchAction; +import org.lamsfoundation.lams.web.session.SessionManager; import org.lamsfoundation.lams.web.util.AttributeNames; import org.springframework.web.context.WebApplicationContext; import org.springframework.web.context.support.WebApplicationContextUtils; @@ -65,6 +68,12 @@ return (IAuthoringService) webContext.getBean(AuthoringConstants.AUTHORING_SERVICE_BEAN_NAME); } + private Integer getUserId() { + HttpSession ss = SessionManager.getSession(); + UserDTO user = (UserDTO) ss.getAttribute(AttributeNames.USER); + return user != null ? user.getUserID() : null; + } + /** Output the supplied WDDX packet. If the request parameter USE_JSP_OUTPUT * is set, then it sets the session attribute "parameterName" to the wddx packet string. * If USE_JSP_OUTPUT is not set, then the packet is written out to the @@ -106,7 +115,8 @@ String wddxPacket; IAuthoringService authoringService = getAuthoringService(); try { - Long userID = new Long(WebUtil.readLongParam(request,"userID")); + Long userID = new Long(getUserId()); + wddxPacket = authoringService.getLearningDesignsForUser(userID); } catch (Exception e) { wddxPacket = handleException(e, "getLearningDesignsForUser", authoringService).serializeMessage(); Index: lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/web/MonitoringAction.java =================================================================== diff -u -r31d961f3a116517218824711b50568c755eef2e8 -rc2d16fd7c49411c4c2c6da861cb880772eb45271 --- lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/web/MonitoringAction.java (.../MonitoringAction.java) (revision 31d961f3a116517218824711b50568c755eef2e8) +++ lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/web/MonitoringAction.java (.../MonitoringAction.java) (revision c2d16fd7c49411c4c2c6da861cb880772eb45271) @@ -675,7 +675,7 @@ HttpServletRequest request, HttpServletResponse response)throws IOException,LamsToolServiceException{ IMonitoringService monitoringService = MonitoringServiceProxy.getMonitoringService(getServlet().getServletContext()); - Integer userID = new Integer(WebUtil.readIntParam(request,"userID")); + Integer userID = getUserId(); Long activityID = new Long(WebUtil.readLongParam(request,"activityID")); Long lessonID = new Long(WebUtil.readLongParam(request,AttributeNames.PARAM_LESSON_ID)); @@ -716,7 +716,7 @@ String wddxPacket = null; try { Long lessonID = new Long(WebUtil.readLongParam(request,"lessonID")); - Integer userID = new Integer(WebUtil.readIntParam(request,"userID")); + Integer userID = getUserId(); Integer targetWorkspaceFolderID = new Integer(WebUtil.readIntParam(request,"folderID")); wddxPacket = monitoringService.moveLesson(lessonID,targetWorkspaceFolderID,userID); } catch (Exception e) { @@ -735,7 +735,7 @@ String wddxPacket = null; try { Long lessonID = new Long(WebUtil.readLongParam(request,"lessonID")); - Integer userID = new Integer(WebUtil.readIntParam(request,"userID")); + Integer userID = getUserId(); String name = WebUtil.readStrParam(request,"name"); wddxPacket = monitoringService.renameLesson(lessonID,name,userID); } catch (Exception e) { @@ -795,13 +795,13 @@ try { - int userID = WebUtil.readIntParam(request,AttributeNames.PARAM_USER_ID); + Integer userID = getUserId(); long learningDesignID = WebUtil.readLongParam(request,AttributeNames.PARAM_LEARNINGDESIGN_ID); String title = WebUtil.readStrParam(request,"title"); String desc = WebUtil.readStrParam(request,"description"); // initialize the lesson - Lesson previewLesson = monitoringService.initializeLessonForPreview(title,desc,learningDesignID,new Integer(userID)); + Lesson previewLesson = monitoringService.initializeLessonForPreview(title,desc,learningDesignID,userID); if ( previewLesson != null ) { long lessonID = previewLesson.getLessonId().longValue();