Skip to content
Snippets Groups Projects
Commit a27f1541 authored by Daniel Vogel's avatar Daniel Vogel
Browse files

Public pool configs only inserted when needed

parent 0251bb47
Branches
Tags
No related merge requests found
...@@ -198,12 +198,15 @@ public class ConfigurationController extends AbstractController { ...@@ -198,12 +198,15 @@ public class ConfigurationController extends AbstractController {
features.put("sessionImportExport", "true".equals(sessionImportExportEnabled)); features.put("sessionImportExport", "true".equals(sessionImportExportEnabled));
features.put("publicPool", "true".equals(publicPoolEnabled)); features.put("publicPool", "true".equals(publicPoolEnabled));
// add public pool configuration // add public pool configuration on demand
config.put("publicPool", publicPool); if (features.get("publicPool")) {
config.put("publicPool", publicPool);
publicPool.put("subjects", ppSubjects); publicPool.put("subjects", ppSubjects);
publicPool.put("licenses", ppLicenses); publicPool.put("licenses", ppLicenses);
publicPool.put("logoMaxFilesize", ppLogoMaxFilesize); publicPool.put("logoMaxFilesize", ppLogoMaxFilesize);
publicPool.put("levelsDe", ppLevelsDe);
publicPool.put("levelsEn", ppLevelsEn);
}
if (!"".equals(trackingTrackerUrl)) { if (!"".equals(trackingTrackerUrl)) {
HashMap<String, String> tracking = new HashMap<String, String>(); HashMap<String, String> tracking = new HashMap<String, String>();
...@@ -213,8 +216,6 @@ public class ConfigurationController extends AbstractController { ...@@ -213,8 +216,6 @@ public class ConfigurationController extends AbstractController {
tracking.put("trackerUrl", trackingTrackerUrl); tracking.put("trackerUrl", trackingTrackerUrl);
tracking.put("siteId", trackingSiteId); tracking.put("siteId", trackingSiteId);
} }
publicPool.put("levelsDe", ppLevelsDe);
publicPool.put("levelsEn", ppLevelsEn);
config.put("grid", gridImageMaxFileSize); config.put("grid", gridImageMaxFileSize);
......
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