From f64d4843f328cbbc8884d309cb6802146d521f7f Mon Sep 17 00:00:00 2001
From: Naoki Takezoe <takezoe@gmail.com>
Date: Sun, 7 Jan 2018 02:01:40 +0900
Subject: [PATCH] (refs #1816) Apply max_file_size to dropzone as well

---
 .../gitbucket/core/controller/FileUploadController.scala   | 7 +------
 src/main/scala/gitbucket/core/util/FileUtil.scala          | 5 +++++
 src/main/twirl/gitbucket/core/helper/attached.scala.html   | 2 +-
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/src/main/scala/gitbucket/core/controller/FileUploadController.scala b/src/main/scala/gitbucket/core/controller/FileUploadController.scala
index edf72681c..5bb0ce17d 100644
--- a/src/main/scala/gitbucket/core/controller/FileUploadController.scala
+++ b/src/main/scala/gitbucket/core/controller/FileUploadController.scala
@@ -21,12 +21,7 @@ import org.apache.commons.io.{FileUtils, IOUtils}
  */
 class FileUploadController extends ScalatraServlet with FileUploadSupport with RepositoryService with AccountService {
 
-  val maxFileSize = if (System.getProperty("gitbucket.maxFileSize") != null)
-    System.getProperty("gitbucket.maxFileSize").toLong
-  else
-    3 * 1024 * 1024
-
-  configureMultipartHandling(MultipartConfig(maxFileSize = Some(maxFileSize)))
+  configureMultipartHandling(MultipartConfig(maxFileSize = Some(FileUtil.MaxFileSize)))
 
   post("/image"){
     execute({ (file, fileId) =>
diff --git a/src/main/scala/gitbucket/core/util/FileUtil.scala b/src/main/scala/gitbucket/core/util/FileUtil.scala
index 6b082d164..070beef98 100644
--- a/src/main/scala/gitbucket/core/util/FileUtil.scala
+++ b/src/main/scala/gitbucket/core/util/FileUtil.scala
@@ -76,4 +76,9 @@ object FileUtil {
     file
   }
 
+  lazy val MaxFileSize = if (System.getProperty("gitbucket.maxFileSize") != null)
+    System.getProperty("gitbucket.maxFileSize").toLong
+  else
+    3 * 1024 * 1024
+
 }
diff --git a/src/main/twirl/gitbucket/core/helper/attached.scala.html b/src/main/twirl/gitbucket/core/helper/attached.scala.html
index c68c2bf23..45469ac2a 100644
--- a/src/main/twirl/gitbucket/core/helper/attached.scala.html
+++ b/src/main/twirl/gitbucket/core/helper/attached.scala.html
@@ -65,7 +65,7 @@ $(function(){
 }
 @dropzone(clickable: Boolean, textareaId: Option[String]) = {
   url: '@context.path/upload/file/@repository.owner/@repository.name',
-  maxFilesize: 10,
+  maxFilesize: @{FileUtil.MaxFileSize / 1024 / 1024},
   clickable: @clickable,
   previewTemplate: "<div class=\"dz-preview\">\n  <div class=\"dz-progress\"><span class=\"dz-upload\" data-dz-uploadprogress>Uploading your files...</span></div>\n  <div class=\"dz-error-message\"><span data-dz-errormessage></span></div>\n</div>",
   success: function(file, id) {