From: Go MAEDA <maeda@farend.jp>
Date: Mon, 23 Mar 2020 05:52:40 +0000 (+0000)
Subject: Display bulk_download_max_size in human-readable representation (#7056).
X-Git-Tag: 4.2.0~1137
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=4a7bc593afad704a75ca662c8bec167305c66909;p=redmine.git

Display bulk_download_max_size in human-readable representation (#7056).

Patch by Go MAEDA.


git-svn-id: http://svn.redmine.org/redmine/trunk@19609 e93f8b46-1217-0410-a6f0-8f06a7374b81
---

diff --git a/app/controllers/attachments_controller.rb b/app/controllers/attachments_controller.rb
index 7e198d0bb..a41476f80 100644
--- a/app/controllers/attachments_controller.rb
+++ b/app/controllers/attachments_controller.rb
@@ -18,6 +18,8 @@
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 
 class AttachmentsController < ApplicationController
+  include ActionView::Helpers::NumberHelper
+
   before_action :find_attachment, :only => [:show, :download, :thumbnail, :update, :destroy]
   before_action :find_container, :only => [:edit_all, :update_all, :download_all]
   before_action :find_downloadable_attachments, :only => :download_all
@@ -239,7 +241,7 @@ class AttachmentsController < ApplicationController
     bulk_download_max_size = Setting.bulk_download_max_size.to_i.kilobytes
     if @attachments.sum(&:filesize) > bulk_download_max_size
       flash[:error] = l(:error_bulk_download_size_too_big,
-                        :max_size => bulk_download_max_size.to_i.kilobytes)
+                        :max_size => number_to_human_size(bulk_download_max_size.to_i))
       redirect_to back_url
       return
     end
diff --git a/test/functional/attachments_controller_test.rb b/test/functional/attachments_controller_test.rb
index 2576f5f7a..09f98e26a 100644
--- a/test/functional/attachments_controller_test.rb
+++ b/test/functional/attachments_controller_test.rb
@@ -617,7 +617,7 @@ class AttachmentsControllerTest < Redmine::ControllerTest
           :back_url => '/issues/2'
       }
       assert_redirected_to '/issues/2'
-      assert_equal flash[:error], 'These attachments cannot be bulk downloaded because the total file size exceeds the maximum allowed size (0)'
+      assert_equal flash[:error], 'These attachments cannot be bulk downloaded because the total file size exceeds the maximum allowed size (0 Bytes)'
     end
   end