Index: lams_central/conf/security/Owasp.CsrfGuard.properties =================================================================== diff -u -r5b9fbd9e325d84d886a2e880982c40734c984ad3 -rb28b1e41d273fdce6c086a72a4e6a9f2e1a8a946 --- lams_central/conf/security/Owasp.CsrfGuard.properties (.../Owasp.CsrfGuard.properties) (revision 5b9fbd9e325d84d886a2e880982c40734c984ad3) +++ lams_central/conf/security/Owasp.CsrfGuard.properties (.../Owasp.CsrfGuard.properties) (revision b28b1e41d273fdce6c086a72a4e6a9f2e1a8a946) @@ -61,8 +61,8 @@ org.owasp.csrfguard.protected.centralAddLessonDependency=/lams/lessonConditions/addLessonDependency.do org.owasp.csrfguard.protected.centralSetDaysToFinish=/lams/lessonConditions/setDaysToLessonFinish.do org.owasp.csrfguard.protected.centralDelLessonDependency=/lams/lessonConditions/removeLessonDependency.do -org.owasp.csrfguard.protected.centralRemoveGrouping=/lams/organisationGroup/removeGrouping.do -org.owasp.csrfguard.protected.centralSaveGroupMappings=/lams/organisationGroup/saveGroupMappings.do +org.owasp.csrfguard.protected.centralRemoveGrouping=/lams/grouping/removeGrouping.do +org.owasp.csrfguard.protected.centralSaveGroupMappings=/lams/grouping/saveGroupMappings.do org.owasp.csrfguard.protected.centralPortraitDelete=/lams/saveportrait/deletePortrait.do org.owasp.csrfguard.protected.centralPortraitSave=/lams/saveportrait.do org.owasp.csrfguard.protected.centralPasswordChange=/lams/passwordChanged.do Index: lams_central/src/java/org/lamsfoundation/lams/web/GroupingController.java =================================================================== diff -u -ra8bfcfbbe983d3069b91882d551d9897b3b4a7fa -rb28b1e41d273fdce6c086a72a4e6a9f2e1a8a946 --- lams_central/src/java/org/lamsfoundation/lams/web/GroupingController.java (.../GroupingController.java) (revision a8bfcfbbe983d3069b91882d551d9897b3b4a7fa) +++ lams_central/src/java/org/lamsfoundation/lams/web/GroupingController.java (.../GroupingController.java) (revision b28b1e41d273fdce6c086a72a4e6a9f2e1a8a946) @@ -83,9 +83,9 @@ import com.fasterxml.jackson.databind.node.ObjectNode; @Controller -@RequestMapping("/organisationGroup") -public class OrganisationGroupController { - private static Logger log = Logger.getLogger(OrganisationGroupController.class); +@RequestMapping("/grouping") +public class GroupingController { + private static Logger log = Logger.getLogger(GroupingController.class); private static final String PARAM_USED_FOR_BRANCHING = "usedForBranching"; Index: lams_central/web/extGroups.jsp =================================================================== diff -u -r4c2d1f37b92435907ec4ce23cb635a7cd9e4161e -rb28b1e41d273fdce6c086a72a4e6a9f2e1a8a946 --- lams_central/web/extGroups.jsp (.../extGroups.jsp) (revision 4c2d1f37b92435907ec4ce23cb635a7cd9e4161e) +++ lams_central/web/extGroups.jsp (.../extGroups.jsp) (revision b28b1e41d273fdce6c086a72a4e6a9f2e1a8a946) @@ -20,7 +20,7 @@ -
+ Index: lams_central/web/includes/javascript/main.js =================================================================== diff -u -r9056bc58b5c132d3cfeb8423e5a5ca8bcb149b48 -rb28b1e41d273fdce6c086a72a4e6a9f2e1a8a946 --- lams_central/web/includes/javascript/main.js (.../main.js) (revision 9056bc58b5c132d3cfeb8423e5a5ca8bcb149b48) +++ lams_central/web/includes/javascript/main.js (.../main.js) (revision b28b1e41d273fdce6c086a72a4e6a9f2e1a8a946) @@ -336,7 +336,7 @@ } function showOrgGroupingDialog(orgID, activityID) { - window.open(LAMS_URL + 'organisationGroup/viewGroupings.do?organisationID=' + orgID + (activityID ? '&activityID=' + activityID : ''), + window.open(LAMS_URL + 'grouping/viewGroupings.do?organisationID=' + orgID + (activityID ? '&activityID=' + activityID : ''), '_blank'); } Index: lams_central/web/includes/javascript/orgGroup.js =================================================================== diff -u -ra13b927ed895f8e3eeaf559371262665e04ff07a -rb28b1e41d273fdce6c086a72a4e6a9f2e1a8a946 --- lams_central/web/includes/javascript/orgGroup.js (.../orgGroup.js) (revision a13b927ed895f8e3eeaf559371262665e04ff07a) +++ lams_central/web/includes/javascript/orgGroup.js (.../orgGroup.js) (revision b28b1e41d273fdce6c086a72a4e6a9f2e1a8a946) @@ -457,7 +457,7 @@ $.ajax({ async : false, cache : false, - url : LAMS_URL + 'organisationGroup/save.do', + url : LAMS_URL + 'grouping/save.do', data : { 'organisationID' : grouping.organisationId, 'grouping' : JSON.stringify(newGrouping) Index: lams_central/web/includes/javascript/orgGrouping.js =================================================================== diff -u -r9056bc58b5c132d3cfeb8423e5a5ca8bcb149b48 -rb28b1e41d273fdce6c086a72a4e6a9f2e1a8a946 --- lams_central/web/includes/javascript/orgGrouping.js (.../orgGrouping.js) (revision 9056bc58b5c132d3cfeb8423e5a5ca8bcb149b48) +++ lams_central/web/includes/javascript/orgGrouping.js (.../orgGrouping.js) (revision b28b1e41d273fdce6c086a72a4e6a9f2e1a8a946) @@ -1,7 +1,7 @@ function removeGrouping(groupingId) { if (!lessonMode && confirm(LABELS.REMOVE_GROUPING_CONFIRM_LABEL)) { //dynamically create a form and submit it - var form = $('
'); + var form = $('
'); var hiddenField = $(''); form.append(hiddenField); @@ -19,7 +19,7 @@ } function viewGroups(groupingId, force) { - var url = LAMS_URL + 'organisationGroup/viewGroups.do?organisationID=' + organisationId; + var url = LAMS_URL + 'grouping/viewGroups.do?organisationID=' + organisationId; if (lessonId) { url += '&lessonID=' + lessonId; } @@ -79,7 +79,7 @@ // save the mapping $.ajax({ - url : LAMS_URL + 'organisationGroup/saveGroupMappings.do', + url : LAMS_URL + 'grouping/saveGroupMappings.do', data : data, type : 'POST', success : function(response) { @@ -110,7 +110,7 @@ // fetch course and branching groups $.ajax({ - url : LAMS_URL + 'organisationGroup/getGroupsForMapping.do', + url : LAMS_URL + 'grouping/getGroupsForMapping.do', data : { 'groupingId' : groupingId, 'activityID' : groupingActivityId Index: lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/web/GroupingController.java =================================================================== diff -u -ra8bfcfbbe983d3069b91882d551d9897b3b4a7fa -rb28b1e41d273fdce6c086a72a4e6a9f2e1a8a946 --- lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/web/GroupingController.java (.../GroupingController.java) (revision a8bfcfbbe983d3069b91882d551d9897b3b4a7fa) +++ lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/web/GroupingController.java (.../GroupingController.java) (revision b28b1e41d273fdce6c086a72a4e6a9f2e1a8a946) @@ -80,8 +80,8 @@ */ @Controller @RequestMapping("/grouping") -public class GroupingAJAXController { - private static Logger log = Logger.getLogger(GroupingAJAXController.class); +public class GroupingController { + private static Logger log = Logger.getLogger(GroupingController.class); @Autowired private IMonitoringFullService monitoringService; @@ -127,13 +127,13 @@ if (!forcePrintView && grouping.isChosenGrouping()) { return "redirect:" + Configuration.get(ConfigurationKeys.SERVER_URL) - + "/organisationGroup/viewGroupings.do?lessonID=" + lessonId + "&activityID=" + activityID; + + "grouping/viewGroupings.do?lessonID=" + lessonId + "&activityID=" + activityID; } request.setAttribute(AttributeNames.PARAM_ACTIVITY_ID, activityID); request.setAttribute(AttributeNames.PARAM_LESSON_ID, lessonId); - request.setAttribute(GroupingAJAXController.PARAM_ACTIVITY_TITLE, activity.getTitle()); - request.setAttribute(GroupingAJAXController.PARAM_ACTIVITY_DESCRIPTION, activity.getDescription()); + request.setAttribute(GroupingController.PARAM_ACTIVITY_TITLE, activity.getTitle()); + request.setAttribute(GroupingController.PARAM_ACTIVITY_DESCRIPTION, activity.getDescription()); SortedSet groups = new TreeSet<>(new GroupComparator()); groups.addAll(grouping.getGroups()); @@ -146,7 +146,7 @@ group.setUsers(sortedUsers); } - request.setAttribute(GroupingAJAXController.GROUPS, groups); + request.setAttribute(GroupingController.GROUPS, groups); // go to a view only screen for random grouping return "grouping/viewGroups"; } @@ -184,7 +184,7 @@ } } - request.setAttribute(GroupingAJAXController.GROUPS, groups); + request.setAttribute(GroupingController.GROUPS, groups); request.setAttribute("isCourseGrouping", true); // flag to page it is a course grouping so use the field names for OrganisationGroup return "grouping/viewGroups"; } @@ -200,7 +200,7 @@ boolean result = true; Long activityID = WebUtil.readLongParam(request, AttributeNames.PARAM_ACTIVITY_ID); - String membersParam = WebUtil.readStrParam(request, GroupingAJAXController.PARAM_MEMBERS, true); + String membersParam = WebUtil.readStrParam(request, GroupingController.PARAM_MEMBERS, true); String[] members = StringUtils.isBlank(membersParam) ? null : membersParam.split(","); // remove users from current group @@ -241,7 +241,7 @@ // group ID = -1 means that user is not being assigned to any new group, i.e. becomse unassigned if (result && ((groupID == null) || (groupID > 0))) { if (groupID == null) { - String name = WebUtil.readStrParam(request, GroupingAJAXController.PARAM_NAME); + String name = WebUtil.readStrParam(request, GroupingController.PARAM_NAME); if (log.isDebugEnabled()) { log.debug("Creating group with name \"" + name + "\" in activity " + activityID); } @@ -331,7 +331,7 @@ @RequestMapping(path = "/changeGroupName", method = RequestMethod.POST) public String changeGroupName(HttpServletRequest request) { Long groupID = WebUtil.readLongParam(request, AttributeNames.PARAM_GROUP_ID); - String name = WebUtil.readStrParam(request, GroupingAJAXController.PARAM_NAME); + String name = WebUtil.readStrParam(request, GroupingController.PARAM_NAME); if (name != null) { if (log.isDebugEnabled()) { log.debug("Renaming group " + groupID + " to \"" + name + "\""); Index: lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/web/GroupingUploadController.java =================================================================== diff -u -ra8bfcfbbe983d3069b91882d551d9897b3b4a7fa -rb28b1e41d273fdce6c086a72a4e6a9f2e1a8a946 --- lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/web/GroupingUploadController.java (.../GroupingUploadController.java) (revision a8bfcfbbe983d3069b91882d551d9897b3b4a7fa) +++ lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/web/GroupingUploadController.java (.../GroupingUploadController.java) (revision b28b1e41d273fdce6c086a72a4e6a9f2e1a8a946) @@ -94,8 +94,8 @@ */ @Controller @RequestMapping("/groupingUpload") -public class GroupingUploadAJAXController { - private static Logger log = Logger.getLogger(GroupingUploadAJAXController.class); +public class GroupingUploadController { + private static Logger log = Logger.getLogger(GroupingUploadController.class); @Autowired private IMonitoringFullService monitoringService; @@ -485,21 +485,21 @@ if (StringUtils.isBlank(login)) { skipped++; - GroupingUploadAJAXController.log.warn( + GroupingUploadController.log.warn( "Unable to add learner for group related to grouping " + groupingID + " as login is missing."); continue; } boolean alreadyExists = !allUsers.add(login); if (alreadyExists) { skipped++; - GroupingUploadAJAXController.log.warn( + GroupingUploadController.log.warn( "Skipping duplicate row for learner " + login + " for group related to grouping " + groupingID); continue; } String groupName = row.getLastCellNum() > 3 ? parseStringCell(row.getCell(3)) : null; if (groupName == null || groupName.length() == 0) { skipped++; - GroupingUploadAJAXController.log.warn("Unable to add learner " + login + GroupingUploadController.log.warn("Unable to add learner " + login + " for group in related to grouping " + groupingID + " as group name is missing."); continue; }