Index: lams_central/conf/language/lams/ApplicationResources_en_AU.properties =================================================================== RCS file: /usr/local/cvsroot/lams_central/conf/language/lams/ApplicationResources_en_AU.properties,v diff -u -r1.111.2.35 -r1.111.2.36 --- lams_central/conf/language/lams/ApplicationResources_en_AU.properties 12 May 2017 14:28:11 -0000 1.111.2.35 +++ lams_central/conf/language/lams/ApplicationResources_en_AU.properties 15 May 2017 20:09:00 -0000 1.111.2.36 @@ -755,5 +755,7 @@ label.save.as.course.grouping =Save as a Course Grouping label.enter.course.grouping.name =Please enter name for the new course grouping label.course.groups.name.not.unique =Course grouping with such name already exists. Please enter another one. +label.save.as.course.grouping.hint =You can save the groups as "Course groupings" so it can be used in other lessons as well. If the groups are just specifically for this lesson, you might not want to do this. Otherwise, click the button to give them a name and reuse them later. +label.advanced.settings =Advanced settings #======= End labels: Exported 744 labels for en AU ===== Index: lams_central/src/java/org/lamsfoundation/lams/web/OrganisationGroupAction.java =================================================================== RCS file: /usr/local/cvsroot/lams_central/src/java/org/lamsfoundation/lams/web/OrganisationGroupAction.java,v diff -u -r1.9.2.16 -r1.9.2.17 --- lams_central/src/java/org/lamsfoundation/lams/web/OrganisationGroupAction.java 15 May 2017 18:10:50 -0000 1.9.2.16 +++ lams_central/src/java/org/lamsfoundation/lams/web/OrganisationGroupAction.java 15 May 2017 20:09:00 -0000 1.9.2.17 @@ -127,12 +127,16 @@ response.sendError(HttpServletResponse.SC_FORBIDDEN, "User is not a participant in the organisation"); return null; } - + + List orgGroupings = getUserManagementService().findByProperty(OrganisationGrouping.class, + "organisationId", organisationId); Grouping grouping = getLessonGrouping(activityID); + + // show groups page if this is a lesson mode and user have already chosen a grouping or there is no organisation + // groupings available boolean lessonGroupsExist = (grouping != null) && (grouping.getGroups() != null) && !grouping.getGroups().isEmpty() && !isDefaultChosenGrouping(grouping); - if (lessonGroupsExist) { - // this is lesson mode and user have already chosen a grouping before, so show it + if (lessonGroupsExist || (activityID!= null &&orgGroupings.isEmpty())) { return viewGroups(mapping, form, request, response); } @@ -168,8 +172,6 @@ request.setAttribute("canEdit", isGroupSuperuser || (activityID != null)); Set orgGroupingDTOs = new TreeSet(); - List orgGroupings = getUserManagementService().findByProperty(OrganisationGrouping.class, - "organisationId", organisationId); for (OrganisationGrouping orgGrouping : orgGroupings) { orgGroupingDTOs.add(new OrganisationGroupingDTO(orgGrouping)); } Index: lams_central/web/orgGroup.jsp =================================================================== RCS file: /usr/local/cvsroot/lams_central/web/orgGroup.jsp,v diff -u -r1.4.2.12 -r1.4.2.13 --- lams_central/web/orgGroup.jsp 15 May 2017 18:10:50 -0000 1.4.2.12 +++ lams_central/web/orgGroup.jsp 15 May 2017 20:09:00 -0000 1.4.2.13 @@ -59,15 +59,6 @@ - -

- -

- - @@ -151,6 +142,21 @@

+ + + + +

+ + +

+ + + +