From 7c22f554557a2ebd3fbc6f97fb5d7a0805af0a0b Mon Sep 17 00:00:00 2001
From: Felix Schmidt <felix.schmidt@mni.thm.de>
Date: Sat, 10 Jan 2015 15:16:39 +0100
Subject: [PATCH] Added public pool configuration to ConfigurationCtrl.
---
.../controller/ConfigurationController.java | 15 ++++++++++++++-
1 file changed, 14 insertions(+), 1 deletion(-)
diff --git a/src/main/java/de/thm/arsnova/controller/ConfigurationController.java b/src/main/java/de/thm/arsnova/controller/ConfigurationController.java
index 4f0a0c4e..93fbc54b 100644
--- a/src/main/java/de/thm/arsnova/controller/ConfigurationController.java
+++ b/src/main/java/de/thm/arsnova/controller/ConfigurationController.java
@@ -94,12 +94,19 @@ public class ConfigurationController extends AbstractController {
@Value("${question.parse-answer-option-formatting:false}")
private String parseAnswerOptionFormatting;
-
+
+ @Value("${pp.subjects}")
+ private String ppSubjects;
+
+ @Value("${pp.licenses}")
+ private String ppLicenses;
+
@RequestMapping(method = RequestMethod.GET)
@ResponseBody
public final HashMap<String, Object> getConfiguration(HttpServletRequest request) {
HashMap<String, Object> config = new HashMap<String, Object>();
HashMap<String, Boolean> features = new HashMap<String, Boolean>();
+ HashMap<String, String> publicPool = new HashMap<String, String>();
/* The API path could be unknown to the client in case the request was forwarded */
config.put("apiPath", request.getContextPath());
@@ -144,6 +151,12 @@ public class ConfigurationController extends AbstractController {
features.put("studentsOwnQuestions", "true".equals(studentsOwnQuestions));
features.put("flashcard", "true".equals(flashcardEnabled));
features.put("gridSquare", "true".equals(gridSquareEnabled));
+
+ // add public pool configuration
+ config.put("publicPool", publicPool);
+
+ publicPool.put("subjects", ppSubjects);
+ publicPool.put("licenses", ppLicenses);
return config;
}
--
GitLab