From f32942608b50b8e6e83856c066add3dc36def0fc Mon Sep 17 00:00:00 2001
From: Daniel Vogel <daniel.vogel@mni.thm.de>
Date: Wed, 14 Jan 2015 13:25:28 +0100
Subject: [PATCH] added filesizes
---
.../thm/arsnova/controller/ConfigurationController.java | 9 +++++++++
1 file changed, 9 insertions(+)
diff --git a/src/main/java/de/thm/arsnova/controller/ConfigurationController.java b/src/main/java/de/thm/arsnova/controller/ConfigurationController.java
index 93fbc54b..443d7efe 100644
--- a/src/main/java/de/thm/arsnova/controller/ConfigurationController.java
+++ b/src/main/java/de/thm/arsnova/controller/ConfigurationController.java
@@ -100,6 +100,12 @@ public class ConfigurationController extends AbstractController {
@Value("${pp.licenses}")
private String ppLicenses;
+
+ @Value("${pp.logofilesize_b}")
+ private String ppLogoMaxFilesize;
+
+ @Value("${upload.filesize_b}")
+ private String gridImageMaxFileSize;
@RequestMapping(method = RequestMethod.GET)
@ResponseBody
@@ -157,6 +163,9 @@ public class ConfigurationController extends AbstractController {
publicPool.put("subjects", ppSubjects);
publicPool.put("licenses", ppLicenses);
+ publicPool.put("logoMaxFilesize", ppLogoMaxFilesize);
+
+ config.put("grid", gridImageMaxFileSize);
return config;
}
--
GitLab