From 1bd202b8867c63336f7a91da4b38ba84d7d16095 Mon Sep 17 00:00:00 2001
From: Daniel Vogel <daniel.vogel@mni.thm.de>
Date: Thu, 15 Jan 2015 18:40:09 +0100
Subject: [PATCH] Added functionality to switch import export feature on and
 off

---
 .../thm/arsnova/controller/ConfigurationController.java   | 8 ++++++++
 src/main/resources/arsnova.properties.example             | 2 ++
 2 files changed, 10 insertions(+)

diff --git a/src/main/java/de/thm/arsnova/controller/ConfigurationController.java b/src/main/java/de/thm/arsnova/controller/ConfigurationController.java
index 443d7efed..fcd6cedcf 100644
--- a/src/main/java/de/thm/arsnova/controller/ConfigurationController.java
+++ b/src/main/java/de/thm/arsnova/controller/ConfigurationController.java
@@ -89,6 +89,12 @@ public class ConfigurationController extends AbstractController {
 	@Value("${features.question-format.grid-square.enabled:false}")
 	private String gridSquareEnabled;
 
+	@Value("${features.session-import-export.enabled:false}")
+	private String sessionImportExportEnabled;
+
+	@Value("${features.public-pool.enabled}")
+	private String publicPoolEnabled;
+
 	@Value("${question.answer-option-limit:8}")
 	private String answerOptionLimit;
 
@@ -157,6 +163,8 @@ public class ConfigurationController extends AbstractController {
 		features.put("studentsOwnQuestions", "true".equals(studentsOwnQuestions));
 		features.put("flashcard", "true".equals(flashcardEnabled));
 		features.put("gridSquare", "true".equals(gridSquareEnabled));
+		features.put("sessionImportExport", "true".equals(sessionImportExportEnabled));
+		features.put("publicPool", "true".equals(publicPoolEnabled));
 		
 		// add public pool configuration
 		config.put("publicPool", publicPool);
diff --git a/src/main/resources/arsnova.properties.example b/src/main/resources/arsnova.properties.example
index b2c355fa3..4ec4bb042 100644
--- a/src/main/resources/arsnova.properties.example
+++ b/src/main/resources/arsnova.properties.example
@@ -171,6 +171,8 @@ features.learning-progress.enabled=false
 features.students-own-questions.enabled=false
 features.question-format.flashcard.enabled=false
 features.question-format.grid-square.enabled=false
+features.session-import-export.enabled=false
+features.public-pool.enabled=false
 
 
 ################################################################################
-- 
GitLab