From 4a8964ad0160e5005bbab645078064d3e0260e32 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andreas=20G=C3=A4rtner?= <andreas.gaertner@hotmail.com>
Date: Sat, 31 Oct 2015 09:47:38 +0100
Subject: [PATCH] Add option to disable image answer feature for freetext
 question format

---
 .../de/thm/arsnova/controller/ConfigurationController.java    | 4 ++++
 src/main/resources/arsnova.properties.example                 | 1 +
 src/test/resources/arsnova.properties.example                 | 1 +
 3 files changed, 6 insertions(+)

diff --git a/src/main/java/de/thm/arsnova/controller/ConfigurationController.java b/src/main/java/de/thm/arsnova/controller/ConfigurationController.java
index 837a000b..c8f18a06 100644
--- a/src/main/java/de/thm/arsnova/controller/ConfigurationController.java
+++ b/src/main/java/de/thm/arsnova/controller/ConfigurationController.java
@@ -91,6 +91,9 @@ public class ConfigurationController extends AbstractController {
 	@Value("${features.students-own-questions.enabled:false}")
 	private String studentsOwnQuestions;
 
+	@Value("${features.freetext-imageanswer.enabled:false}")
+	private String imageAnswerEnabled;
+
 	@Value("${features.question-format.flashcard.enabled:false}")
 	private String flashcardEnabled;
 
@@ -224,6 +227,7 @@ public class ConfigurationController extends AbstractController {
 		features.put("markdown", "true".equals(markdownEnabled));
 		features.put("learningProgress", "true".equals(learningProgressEnabled));
 		features.put("studentsOwnQuestions", "true".equals(studentsOwnQuestions));
+		features.put("imageAnswer", "true".equals(imageAnswerEnabled));
 		features.put("flashcard", "true".equals(flashcardEnabled));
 		features.put("gridSquare", "true".equals(gridSquareEnabled));
 		features.put("sessionImportExport", "true".equals(sessionImportExportEnabled));
diff --git a/src/main/resources/arsnova.properties.example b/src/main/resources/arsnova.properties.example
index ba66153c..2b20df7d 100644
--- a/src/main/resources/arsnova.properties.example
+++ b/src/main/resources/arsnova.properties.example
@@ -175,6 +175,7 @@ features.mathjax.src=//cdn.mathjax.org/mathjax/2.4-latest/MathJax.js
 features.markdown.enabled=true
 features.learning-progress.enabled=true
 features.students-own-questions.enabled=true
+features.freetext-imageanswer.enabled=true
 features.question-format.flashcard.enabled=true
 features.question-format.grid-square.enabled=true
 
diff --git a/src/test/resources/arsnova.properties.example b/src/test/resources/arsnova.properties.example
index b89a2eeb..ee688971 100644
--- a/src/test/resources/arsnova.properties.example
+++ b/src/test/resources/arsnova.properties.example
@@ -175,6 +175,7 @@ features.mathjax.src=//cdn.mathjax.org/mathjax/2.4-latest/MathJax.js
 features.markdown.enabled=false
 features.learning-progress.enabled=false
 features.students-own-questions.enabled=false
+features.freetext-imageanswer.enabled=false
 features.question-format.flashcard.enabled=false
 features.question-format.grid-square.enabled=false
 
-- 
GitLab