From 90bc85a8a60ba2c9cd401e0169f93050063def67 Mon Sep 17 00:00:00 2001
From: Daniel Gerhardt <code@dgerhardt.net>
Date: Tue, 2 Feb 2016 11:23:33 +0100
Subject: [PATCH] Remove support for obsolete config properties
See also:
003b064ba39034d98b0c8255c025b9c72b09c4a6
---
.../arsnova/controller/ConfigurationController.java | 13 ++-----------
src/main/resources/arsnova.properties.example | 4 ----
src/test/resources/arsnova.properties.example | 4 ----
3 files changed, 2 insertions(+), 19 deletions(-)
diff --git a/src/main/java/de/thm/arsnova/controller/ConfigurationController.java b/src/main/java/de/thm/arsnova/controller/ConfigurationController.java
index 29323a84..eebf99f8 100644
--- a/src/main/java/de/thm/arsnova/controller/ConfigurationController.java
+++ b/src/main/java/de/thm/arsnova/controller/ConfigurationController.java
@@ -82,21 +82,12 @@ public class ConfigurationController extends AbstractController {
@Value("${features.mathjax.src:}")
private String mathJaxSrc;
- @Value("${features.markdown.enabled:false}")
- private String markdownEnabled;
-
- @Value("${features.learning-progress.enabled:false}")
- private String learningProgressEnabled;
-
@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;
-
@Value("${features.question-format.grid-square.enabled:false}")
private String gridSquareEnabled;
@@ -230,10 +221,10 @@ public class ConfigurationController extends AbstractController {
config.put("features", features);
features.put("mathJax", "true".equals(mathJaxEnabled));
- features.put("markdown", "true".equals(markdownEnabled));
+ /* Keep the markdown property for now since the frontend still depends on it */
+ features.put("markdown", true);
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));
features.put("publicPool", "true".equals(publicPoolEnabled));
diff --git a/src/main/resources/arsnova.properties.example b/src/main/resources/arsnova.properties.example
index 450ab14d..2dc5421a 100644
--- a/src/main/resources/arsnova.properties.example
+++ b/src/main/resources/arsnova.properties.example
@@ -177,16 +177,12 @@ connector.password=test
features.mathjax.enabled=true
features.mathjax.src=//cdn.mathjax.org/mathjax/2.4-latest/MathJax.js
-# Enable Markdown for text formatting, links and embedded media
-features.markdown.enabled=true
-
# The following features are considered experimental because they have not been
# tested in a production environment over a longer time frame and/or their
# behavior will change in future releases.
#
features.students-own-questions.enabled=true
features.freetext-imageanswer.enabled=true
-features.question-format.flashcard.enabled=true
features.question-format.grid-square.enabled=true
# Without enabled session-import-export feature no sessions can be added to the
diff --git a/src/test/resources/arsnova.properties.example b/src/test/resources/arsnova.properties.example
index 450ab14d..2dc5421a 100644
--- a/src/test/resources/arsnova.properties.example
+++ b/src/test/resources/arsnova.properties.example
@@ -177,16 +177,12 @@ connector.password=test
features.mathjax.enabled=true
features.mathjax.src=//cdn.mathjax.org/mathjax/2.4-latest/MathJax.js
-# Enable Markdown for text formatting, links and embedded media
-features.markdown.enabled=true
-
# The following features are considered experimental because they have not been
# tested in a production environment over a longer time frame and/or their
# behavior will change in future releases.
#
features.students-own-questions.enabled=true
features.freetext-imageanswer.enabled=true
-features.question-format.flashcard.enabled=true
features.question-format.grid-square.enabled=true
# Without enabled session-import-export feature no sessions can be added to the
--
GitLab