Index: lams_build/lib/lams/lams.jar =================================================================== diff -u -r94a4ee377b6f565f4b5228bdfe4fcc4c1c4e5030 -rca158cbd222938030f3d7bdd0cc39357478b55ff Binary files differ Index: lams_central/src/java/org/lamsfoundation/lams/authoring/service/AuthoringService.java =================================================================== diff -u -r2e5d858e9dd95ddc9aa092c307b2039c9cb62930 -rca158cbd222938030f3d7bdd0cc39357478b55ff --- lams_central/src/java/org/lamsfoundation/lams/authoring/service/AuthoringService.java (.../AuthoringService.java) (revision 2e5d858e9dd95ddc9aa092c307b2039c9cb62930) +++ lams_central/src/java/org/lamsfoundation/lams/authoring/service/AuthoringService.java (.../AuthoringService.java) (revision ca158cbd222938030f3d7bdd0cc39357478b55ff) @@ -1939,7 +1939,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); @@ -1975,7 +1975,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 -r5a60c8d2319e06b012ed869471a65e4e88ceb7d0 -rca158cbd222938030f3d7bdd0cc39357478b55ff --- lams_central/src/java/org/lamsfoundation/lams/authoring/service/IAuthoringService.java (.../IAuthoringService.java) (revision 5a60c8d2319e06b012ed869471a65e4e88ceb7d0) +++ lams_central/src/java/org/lamsfoundation/lams/authoring/service/IAuthoringService.java (.../IAuthoringService.java) (revision ca158cbd222938030f3d7bdd0cc39357478b55ff) @@ -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 -r90845b9a3eb85240233e6f57923dd0e3fa40e93c -rca158cbd222938030f3d7bdd0cc39357478b55ff --- lams_central/src/java/org/lamsfoundation/lams/authoring/web/AuthoringAction.java (.../AuthoringAction.java) (revision 90845b9a3eb85240233e6f57923dd0e3fa40e93c) +++ lams_central/src/java/org/lamsfoundation/lams/authoring/web/AuthoringAction.java (.../AuthoringAction.java) (revision ca158cbd222938030f3d7bdd0cc39357478b55ff) @@ -455,6 +455,7 @@ IAuthoringService authoringService = getAuthoringService(); Long toolID = WebUtil.readLongParam(request, AttributeNames.PARAM_TOOL_ID); Long toolContentID = WebUtil.readLongParam(request, AttributeNames.PARAM_TOOL_CONTENT_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(); @@ -471,7 +472,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 -r47a1a52e59cf872dd5cca6e842fab3c1d90e0ef4 -rca158cbd222938030f3d7bdd0cc39357478b55ff --- lams_central/web/groupHeader.jsp (.../groupHeader.jsp) (revision 47a1a52e59cf872dd5cca6e842fab3c1d90e0ef4) +++ lams_central/web/groupHeader.jsp (.../groupHeader.jsp) (revision ca158cbd222938030f3d7bdd0cc39357478b55ff) @@ -43,7 +43,7 @@