From a4bb697f27b22ebdaa9d22e9aa34b53c12a67d08 Mon Sep 17 00:00:00 2001
From: Daniel Gerhardt <daniel.gerhardt@mni.thm.de>
Date: Sat, 24 May 2014 13:43:41 +0200
Subject: [PATCH] Add configuration property to enable/disable parseing of
answer options
---
.../de/thm/arsnova/controller/ConfigurationController.java | 6 +++++-
src/main/webapp/arsnova.properties.example | 5 +++++
src/test/resources/arsnova.properties.example | 5 +++++
3 files changed, 15 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 e69c6fd30..ab137e017 100644
--- a/src/main/java/de/thm/arsnova/controller/ConfigurationController.java
+++ b/src/main/java/de/thm/arsnova/controller/ConfigurationController.java
@@ -72,9 +72,12 @@ public class ConfigurationController extends AbstractController {
@Value("${features.question-format.grid-square.enabled:false}")
private String gridSquareEnabled;
- @Value("${answerOptionLimit:8}")
+ @Value("${question.answerOptionLimit:8}")
private String answerOptionLimit;
+ @Value("${question.parse-answer-option-formatting:false}")
+ private String parseAnswerOptionFormatting;
+
@RequestMapping(value = { "/" }, method = RequestMethod.GET)
@ResponseBody
public final HashMap<String, Object> getConfiguration(HttpServletRequest request) {
@@ -107,6 +110,7 @@ public class ConfigurationController extends AbstractController {
}
config.put("answerOptionLimit", Integer.valueOf(answerOptionLimit));
+ config.put("parseAnswerOptionFormatting", Boolean.valueOf(parseAnswerOptionFormatting));
config.put("features", features);
diff --git a/src/main/webapp/arsnova.properties.example b/src/main/webapp/arsnova.properties.example
index 89caad29e..b44d2002b 100644
--- a/src/main/webapp/arsnova.properties.example
+++ b/src/main/webapp/arsnova.properties.example
@@ -66,6 +66,11 @@ upload.filesize_b=1048576
# maximal number of answer options allowed for a skill question
question.answerOptionLimit=8
+# Enable Markdown and MathJax parsing in answer options. Formatting in answer options should
+# be used cautiously since it could lead to display errors. Answer options will still not
+# be parsed in diagrams. This setting has no effect if neither MathJax nor Markdown are enabled.
+question.parse-answer-option-formatting=false
+
couchdb.host=localhost
couchdb.port=5984
couchdb.name=arsnova
diff --git a/src/test/resources/arsnova.properties.example b/src/test/resources/arsnova.properties.example
index 89caad29e..b44d2002b 100644
--- a/src/test/resources/arsnova.properties.example
+++ b/src/test/resources/arsnova.properties.example
@@ -66,6 +66,11 @@ upload.filesize_b=1048576
# maximal number of answer options allowed for a skill question
question.answerOptionLimit=8
+# Enable Markdown and MathJax parsing in answer options. Formatting in answer options should
+# be used cautiously since it could lead to display errors. Answer options will still not
+# be parsed in diagrams. This setting has no effect if neither MathJax nor Markdown are enabled.
+question.parse-answer-option-formatting=false
+
couchdb.host=localhost
couchdb.port=5984
couchdb.name=arsnova
--
GitLab