Index: lams_build/lib/lams/lams.jar =================================================================== diff -u -r84833eb93346135ae7c40d7649fcc196c793c9ec -rc48c8002ccae15f230099c704b48a39e7fe3a382 Binary files differ Index: lams_central/src/java/org/lamsfoundation/lams/authoring/service/AuthoringService.java =================================================================== diff -u -r95574f488cd396cd8e0e246a091a23dca4190e4f -rc48c8002ccae15f230099c704b48a39e7fe3a382 --- lams_central/src/java/org/lamsfoundation/lams/authoring/service/AuthoringService.java (.../AuthoringService.java) (revision 95574f488cd396cd8e0e246a091a23dca4190e4f) +++ lams_central/src/java/org/lamsfoundation/lams/authoring/service/AuthoringService.java (.../AuthoringService.java) (revision c48c8002ccae15f230099c704b48a39e7fe3a382) @@ -1918,7 +1918,7 @@ */ @Override @SuppressWarnings("unchecked") - public Long insertSingleActivityLearningDesign(String learningDesignTitle, Long toolID, Long toolContentID, + public Long insertSingleActivityLearningDesign(String learningDesignTitle, Long toolID, Long toolContentID, Long learningLibraryID, String contentFolderID, Integer organisationID) { Integer userID = AuthoringService.getUserId(); User user = (User) baseDAO.find(User.class, userID); @@ -1954,7 +1954,7 @@ learningDesign.setWorkspaceFolder(folder); learningDesignDAO.insert(learningDesign); - ToolActivity templateActivity = (ToolActivity) activityDAO.getTemplateActivityByLibraryID(toolID); + ToolActivity templateActivity = (ToolActivity) activityDAO.getTemplateActivityByLibraryID(learningLibraryID); ToolActivity activity = (ToolActivity) templateActivity.createCopy(1); activity.setLearningDesign(learningDesign); activity.setToolContentId(toolContentID); Index: lams_central/src/java/org/lamsfoundation/lams/authoring/service/IAuthoringService.java =================================================================== diff -u -reb0183f0f7d15c69904ea0fe9c97cda8359af903 -rc48c8002ccae15f230099c704b48a39e7fe3a382 --- lams_central/src/java/org/lamsfoundation/lams/authoring/service/IAuthoringService.java (.../IAuthoringService.java) (revision eb0183f0f7d15c69904ea0fe9c97cda8359af903) +++ lams_central/src/java/org/lamsfoundation/lams/authoring/service/IAuthoringService.java (.../IAuthoringService.java) (revision c48c8002ccae15f230099c704b48a39e7fe3a382) @@ -364,7 +364,7 @@ public String getToolAuthorUrl(Long toolID, Long toolContentID, String contentFolderID); - public Long insertSingleActivityLearningDesign(String learningDesignTitle, Long toolID, Long toolContentID, + public Long insertSingleActivityLearningDesign(String learningDesignTitle, Long toolID, Long toolContentID, Long learningLibraryID, String contentFolderID, Integer organisationID); public List updateLearningDesignAccessByUser(Integer userId); Index: lams_central/src/java/org/lamsfoundation/lams/authoring/web/AuthoringAction.java =================================================================== diff -u -reb0183f0f7d15c69904ea0fe9c97cda8359af903 -rc48c8002ccae15f230099c704b48a39e7fe3a382 --- lams_central/src/java/org/lamsfoundation/lams/authoring/web/AuthoringAction.java (.../AuthoringAction.java) (revision eb0183f0f7d15c69904ea0fe9c97cda8359af903) +++ lams_central/src/java/org/lamsfoundation/lams/authoring/web/AuthoringAction.java (.../AuthoringAction.java) (revision c48c8002ccae15f230099c704b48a39e7fe3a382) @@ -457,7 +457,8 @@ IAuthoringService authoringService = getAuthoringService(); Long toolID = WebUtil.readLongParam(request, AttributeNames.PARAM_TOOL_ID); Long toolContentID = WebUtil.readLongParam(request, AttributeNames.PARAM_TOOL_CONTENT_ID); - String contentFolderID = request.getParameter(AttributeNames.PARAM_CONTENT_FOLDER_ID); + Long learningLibraryID = WebUtil.readLongParam(request, AttributeNames.PARAM_LEARNING_LIBRARY_ID); + String contentFolderID = request.getParameter(AttributeNames.PARAM_CONTENT_FOLDER_ID); Integer organisationID = WebUtil.readIntParam(request, AttributeNames.PARAM_ORGANISATION_ID); Integer userID = getUserId(); @@ -473,7 +474,7 @@ ToolContentManager toolManager = (ToolContentManager) wac.getBean(tool.getServiceName()); String title = toolManager.getToolContentTitle(toolContentID); // create the LD and put it in Run Sequences folder in the given organisation - Long learningDesignID = authoringService.insertSingleActivityLearningDesign(title, toolID, toolContentID, + Long learningDesignID = authoringService.insertSingleActivityLearningDesign(title, toolID, toolContentID, learningLibraryID, contentFolderID, organisationID); if (learningDesignID != null) { User user = (User) getUserManagementService().findById(User.class, userID); Index: lams_central/web/groupHeader.jsp =================================================================== diff -u -r057353dc82b0e66826f7bdc7953e82d528a4a65e -rc48c8002ccae15f230099c704b48a39e7fe3a382 --- lams_central/web/groupHeader.jsp (.../groupHeader.jsp) (revision 057353dc82b0e66826f7bdc7953e82d528a4a65e) +++ lams_central/web/groupHeader.jsp (.../groupHeader.jsp) (revision c48c8002ccae15f230099c704b48a39e7fe3a382) @@ -43,7 +43,7 @@