Skip to content
Snippets Groups Projects
Commit fea06f46 authored by srosse's avatar srosse
Browse files

OO-3754: add missing coaches for courses configuration

parent 7aef948f
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
src/main/java/org/olat/course/nodes/co/CORunController.java
+ 12
− 6
View file @ fea06f46
...@@ -101,8 +101,9 @@ public class CORunController extends BasicController { ...@@ -101,8 +101,9 @@ public class CORunController extends BasicController {
// Adding learning objectives using a consumable panel. Will only be // Adding learning objectives using a consumable panel. Will only be
// displayed on the first page // displayed on the first page
Boolean partipsCourseConfigured = moduleConfiguration.getBooleanEntry(COEditController.CONFIG_KEY_EMAILTOPARTICIPANTS_COURSE); Boolean participantsCourseConfigured = moduleConfiguration.getBooleanEntry(COEditController.CONFIG_KEY_EMAILTOPARTICIPANTS_COURSE);
Boolean partipsAllConfigured = moduleConfiguration.getBooleanEntry(COEditController.CONFIG_KEY_EMAILTOPARTICIPANTS_ALL); Boolean participantsAllConfigured = moduleConfiguration.getBooleanEntry(COEditController.CONFIG_KEY_EMAILTOPARTICIPANTS_ALL);
Boolean coachesCourseConfigured = moduleConfiguration.getBooleanEntry(COEditController.CONFIG_KEY_EMAILTOCOACHES_COURSE);
Boolean coachesAllConfigured = moduleConfiguration.getBooleanEntry(COEditController.CONFIG_KEY_EMAILTOCOACHES_ALL); Boolean coachesAllConfigured = moduleConfiguration.getBooleanEntry(COEditController.CONFIG_KEY_EMAILTOCOACHES_ALL);
Boolean ownersConfigured = moduleConfiguration.getBooleanEntry(COEditController.CONFIG_KEY_EMAILTOOWNERS); Boolean ownersConfigured = moduleConfiguration.getBooleanEntry(COEditController.CONFIG_KEY_EMAILTOOWNERS);
Stack<ContactList> contactLists = new Stack<ContactList>(); Stack<ContactList> contactLists = new Stack<ContactList>();
...@@ -149,6 +150,7 @@ public class CORunController extends BasicController { ...@@ -149,6 +150,7 @@ public class CORunController extends BasicController {
ContactList cl = retrieveParticipantsFromAreas(participantAreaKeys); ContactList cl = retrieveParticipantsFromAreas(participantAreaKeys);
contactLists.push(cl); contactLists.push(cl);
} }
if (coachesAllConfigured != null && coachesAllConfigured.booleanValue()) { if (coachesAllConfigured != null && coachesAllConfigured.booleanValue()) {
ContactList cl = retrieveCoachesFromCourse(); ContactList cl = retrieveCoachesFromCourse();
contactLists.push(cl); contactLists.push(cl);
...@@ -161,8 +163,12 @@ public class CORunController extends BasicController { ...@@ -161,8 +163,12 @@ public class CORunController extends BasicController {
contactLists.push(cl); contactLists.push(cl);
cl = retrieveCoachesFromAreas(grp_keys); cl = retrieveCoachesFromAreas(grp_keys);
contactLists.push(cl); contactLists.push(cl);
} else if (coachesCourseConfigured != null && coachesCourseConfigured.booleanValue()){
ContactList cl = retrieveCoachesFromCourse();
contactLists.push(cl);
} }
if (partipsAllConfigured != null && partipsAllConfigured.booleanValue()) {
if (participantsAllConfigured != null && participantsAllConfigured.booleanValue()) {
ContactList cl = retrieveParticipantsFromCourse(); ContactList cl = retrieveParticipantsFromCourse();
contactLists.push(cl); contactLists.push(cl);
List<BusinessGroup> groups = cgm.getAllBusinessGroups(); List<BusinessGroup> groups = cgm.getAllBusinessGroups();
...@@ -174,11 +180,11 @@ public class CORunController extends BasicController { ...@@ -174,11 +180,11 @@ public class CORunController extends BasicController {
contactLists.push(cl); contactLists.push(cl);
cl = retrieveParticipantsFromAreas(grp_keys); cl = retrieveParticipantsFromAreas(grp_keys);
contactLists.push(cl); contactLists.push(cl);
} } else if (participantsCourseConfigured != null && participantsCourseConfigured.booleanValue()){
if (partipsCourseConfigured != null && partipsCourseConfigured.booleanValue()){
ContactList cl = retrieveParticipantsFromCourse(); ContactList cl = retrieveParticipantsFromCourse();
contactLists.push(cl); contactLists.push(cl);
} }
if (ownersConfigured != null && ownersConfigured){ if (ownersConfigured != null && ownersConfigured){
ContactList cl = retrieveOwnersFromCourse(); ContactList cl = retrieveOwnersFromCourse();
contactLists.push(cl); contactLists.push(cl);
...@@ -194,7 +200,7 @@ public class CORunController extends BasicController { ...@@ -194,7 +200,7 @@ public class CORunController extends BasicController {
ContactList cl = retrieveCoachesFromAreas(areaKeys); ContactList cl = retrieveCoachesFromAreas(areaKeys);
contactLists.push(cl); contactLists.push(cl);
} }
if (partipsAllConfigured != null && partipsAllConfigured.booleanValue()) { if (participantsAllConfigured != null && participantsAllConfigured.booleanValue()) {
ContactList cl = retrieveParticipantsFromAreas(areaKeys); ContactList cl = retrieveParticipantsFromAreas(areaKeys);
contactLists.push(cl); contactLists.push(cl);
} }
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment