From 24b991d847a8ff69844f5aeb6e32896a1a0478c8 Mon Sep 17 00:00:00 2001
From: srosse <none@none>
Date: Wed, 27 Sep 2017 20:48:21 +0200
Subject: [PATCH] OO-3048: don't override the default configuration of user
tools by enabling the lectures module
---
.../ui/LectureSettingsAdminController.java | 20 ++++++++++---------
1 file changed, 11 insertions(+), 9 deletions(-)
diff --git a/src/main/java/org/olat/modules/lecture/ui/LectureSettingsAdminController.java b/src/main/java/org/olat/modules/lecture/ui/LectureSettingsAdminController.java
index 28f20ddf3b2..5ab057b48c3 100644
--- a/src/main/java/org/olat/modules/lecture/ui/LectureSettingsAdminController.java
+++ b/src/main/java/org/olat/modules/lecture/ui/LectureSettingsAdminController.java
@@ -362,16 +362,18 @@ public class LectureSettingsAdminController extends FormBasicController {
//enabled user tool
Set<String> availableTools = userToolsModule.getAvailableUserToolSet();
- if(!availableTools.contains("org.olat.home.HomeMainController:org.olat.modules.lecture.ui.LecturesToolController")) {
- availableTools.add("org.olat.home.HomeMainController:org.olat.modules.lecture.ui.LecturesToolController");
- }
-
- StringBuilder aTools = new StringBuilder();
- for(String selectedKey:availableTools) {
- if(aTools.length() > 0) aTools.append(",");
- aTools.append(selectedKey);
+ if(availableTools.size() > 0) {
+ if(!availableTools.contains("org.olat.home.HomeMainController:org.olat.modules.lecture.ui.LecturesToolController")) {
+ availableTools.add("org.olat.home.HomeMainController:org.olat.modules.lecture.ui.LecturesToolController");
+ }
+
+ StringBuilder aTools = new StringBuilder();
+ for(String selectedKey:availableTools) {
+ if(aTools.length() > 0) aTools.append(",");
+ aTools.append(selectedKey);
+ }
+ userToolsModule.setAvailableUserTools(aTools.toString());
}
- userToolsModule.setAvailableUserTools(aTools.toString());
lectureModule.setRollCallDefaultEnabled(rollCallEnableEl.isAtLeastSelected(1));
--
GitLab