From a27f15413b760ecef0e7a03f88ba3a3f7b511a74 Mon Sep 17 00:00:00 2001
From: Daniel Vogel <daniel.vogel@mni.thm.de>
Date: Wed, 28 Jan 2015 00:03:09 +0100
Subject: [PATCH] Public pool configs only inserted when needed
---
.../controller/ConfigurationController.java | 17 +++++++++--------
1 file changed, 9 insertions(+), 8 deletions(-)
diff --git a/src/main/java/de/thm/arsnova/controller/ConfigurationController.java b/src/main/java/de/thm/arsnova/controller/ConfigurationController.java
index 168fec5b..5f6cd0df 100644
--- a/src/main/java/de/thm/arsnova/controller/ConfigurationController.java
+++ b/src/main/java/de/thm/arsnova/controller/ConfigurationController.java
@@ -198,12 +198,15 @@ public class ConfigurationController extends AbstractController {
features.put("sessionImportExport", "true".equals(sessionImportExportEnabled));
features.put("publicPool", "true".equals(publicPoolEnabled));
- // add public pool configuration
- config.put("publicPool", publicPool);
-
- publicPool.put("subjects", ppSubjects);
- publicPool.put("licenses", ppLicenses);
- publicPool.put("logoMaxFilesize", ppLogoMaxFilesize);
+ // add public pool configuration on demand
+ if (features.get("publicPool")) {
+ config.put("publicPool", publicPool);
+ publicPool.put("subjects", ppSubjects);
+ publicPool.put("licenses", ppLicenses);
+ publicPool.put("logoMaxFilesize", ppLogoMaxFilesize);
+ publicPool.put("levelsDe", ppLevelsDe);
+ publicPool.put("levelsEn", ppLevelsEn);
+ }
if (!"".equals(trackingTrackerUrl)) {
HashMap<String, String> tracking = new HashMap<String, String>();
@@ -213,8 +216,6 @@ public class ConfigurationController extends AbstractController {
tracking.put("trackerUrl", trackingTrackerUrl);
tracking.put("siteId", trackingSiteId);
}
- publicPool.put("levelsDe", ppLevelsDe);
- publicPool.put("levelsEn", ppLevelsEn);
config.put("grid", gridImageMaxFileSize);
--
GitLab