From b52ca4118efd13ee0f97845a25e860436d01bc1f Mon Sep 17 00:00:00 2001
From: agrt56 <andreas.gaertner@mni.thm.de>
Date: Tue, 27 Jan 2015 18:57:51 +0100
Subject: [PATCH] Added maxUploadFilesize config to configuration controller.
---
.../de/thm/arsnova/controller/ConfigurationController.java | 6 ++++++
1 file 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 a0d263dc..52dbe9d0 100644
--- a/src/main/java/de/thm/arsnova/controller/ConfigurationController.java
+++ b/src/main/java/de/thm/arsnova/controller/ConfigurationController.java
@@ -96,6 +96,9 @@ public class ConfigurationController extends AbstractController {
@Value("${question.answer-option-limit:8}")
private String answerOptionLimit;
+
+ @Value("${upload.filesize_b:}")
+ private String maxUploadFilesize;
@Value("${question.parse-answer-option-formatting:false}")
private String parseAnswerOptionFormatting;
@@ -158,6 +161,9 @@ public class ConfigurationController extends AbstractController {
if (!"".equals(demoSessionKey)) {
config.put("demoSessionKey", demoSessionKey);
}
+ if (!"".equals(maxUploadFilesize)) {
+ config.put("maxUploadFilesize", maxUploadFilesize);
+ }
config.put("answerOptionLimit", Integer.valueOf(answerOptionLimit));
config.put("parseAnswerOptionFormatting", Boolean.valueOf(parseAnswerOptionFormatting));
--
GitLab