diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb index f26c463fe6536176946699639d8a2602e0c5ff07..83551e553d76df160198151f26f9419cdcbf0dc9 100644 --- a/app/helpers/application_helper.rb +++ b/app/helpers/application_helper.rb @@ -69,7 +69,7 @@ module ApplicationHelper Rails.application.config.default_audio_formats.join(', ') end - def file_hint(filesize: number_to_human_size(Communication::Block::FILE_MAX_SIZE), formats: []) + def file_hint(filesize: number_to_human_size(Rails.application.config.default_files_size_max), formats: []) if formats.empty? t('file_hint_without_formats', filesize: filesize) else @@ -78,7 +78,7 @@ module ApplicationHelper end def images_formats_accepted_hint(formats: default_images_formats_accepted) - file_hint(filesize: number_to_human_size(Communication::Block::IMAGE_MAX_SIZE), formats: formats) + file_hint(filesize: number_to_human_size(Rails.application.config.default_images_size_max), formats: formats) end def audio_formats_accepted_hint(formats: default_audio_formats_accepted) diff --git a/app/models/communication/block.rb b/app/models/communication/block.rb index aad6c670dff1b8f346a333bfb700680aead05fdd..8ce38b1417c5b81340ecc63d3dafd05bf925d3e0 100644 --- a/app/models/communication/block.rb +++ b/app/models/communication/block.rb @@ -39,8 +39,6 @@ class Communication::Block < ApplicationRecord include WithUniversity include Sanitizable - IMAGE_MAX_SIZE = 5.megabytes - FILE_MAX_SIZE = 100.megabytes BLOCK_COPY_COOKIE = 'osuny-content-editor-block-copy' belongs_to :about, polymorphic: true diff --git a/app/views/admin/communication/blocks/components/file/_edit.html.erb b/app/views/admin/communication/blocks/components/file/_edit.html.erb index ec26c76738980a04a3ef12233bae9a1b4d337966..7535ae4a12ba7f87e7c8779d0dc6d559eaa6b18b 100644 --- a/app/views/admin/communication/blocks/components/file/_edit.html.erb +++ b/app/views/admin/communication/blocks/components/file/_edit.html.erb @@ -14,7 +14,7 @@ accept ||= '*' type="file" accept="<%= accept %>" @change="onFileImageChange( $event, <%= model %>, '<%= property %>' )" - data-size-limit="<%= Communication::Block::FILE_MAX_SIZE %>" + data-size-limit="<%= Rails.application.config.default_files_size_max %>" :id="<%= dom_id.html_safe %>"> </div> <div v-if="<%= model %>.<%= property %>.id"> diff --git a/app/views/admin/communication/blocks/components/image/_edit.html.erb b/app/views/admin/communication/blocks/components/image/_edit.html.erb index a16a1905247fb98e6a10e3d94973955a3b835840..2e57c936d513509f703715630dd28e7cbe1525f1 100644 --- a/app/views/admin/communication/blocks/components/image/_edit.html.erb +++ b/app/views/admin/communication/blocks/components/image/_edit.html.erb @@ -13,7 +13,7 @@ hint = images_formats_accepted_hint type="file" accept="<%= default_images_formats_accepted %>" @change="onFileImageChange( $event, <%= model %>, '<%= property %>' )" - data-size-limit="<%= Communication::Block::IMAGE_MAX_SIZE %>" + data-size-limit="<%= Rails.application.config.default_images_size_max %>" :id="<%= dom_id.html_safe %>" > </div> diff --git a/app/views/admin/communication/blocks/edit.html.erb b/app/views/admin/communication/blocks/edit.html.erb index a5ad1b8dae8cc5e10ece1cba5834706566f83c05..4b678750aab05f417c589b764a81f48440e38061 100644 --- a/app/views/admin/communication/blocks/edit.html.erb +++ b/app/views/admin/communication/blocks/edit.html.erb @@ -84,7 +84,7 @@ }, uploadFile(input, file, object, key) { var size = Math.round(file.size / 1024 / 1024), - sizeLimit = <%= Communication::Block::IMAGE_MAX_SIZE %>, + sizeLimit = <%= Rails.application.config.default_images_size_max %>, sizeLimitMo = 0, controller; if (input.hasAttribute('data-size-limit')) { diff --git a/app/views/admin/communication/blocks/templates/gallery/_edit.html.erb b/app/views/admin/communication/blocks/templates/gallery/_edit.html.erb index e8659571734054a78f01f2c9f2bf31d0d67f6b50..a107499c4fd7b62f105f04ec2c7ca0ebbd9fdbf1 100644 --- a/app/views/admin/communication/blocks/templates/gallery/_edit.html.erb +++ b/app/views/admin/communication/blocks/templates/gallery/_edit.html.erb @@ -12,7 +12,7 @@ type="file" accept="<%= default_images_formats_accepted %>" @change="onMultipleFileImageChange( $event, 'image' )" - data-size-limit="<%= Communication::Block::IMAGE_MAX_SIZE %>" + data-size-limit="<%= Rails.application.config.default_images_size_max %>" multiple> <div class="form-text mb-2"> diff --git a/config/application.rb b/config/application.rb index c81a51f8a59694ae1c74ca2c030e9d5a5eda6f15..edde332815de97e87fec710c47d54cb04d15a991 100644 --- a/config/application.rb +++ b/config/application.rb @@ -70,6 +70,10 @@ module Osuny ] config.allowed_special_chars = '#?!,_@$%^&*+:;£µ-' + + # FILES + config.default_files_size_max = 100.megabytes + config.default_images_size_max = 5.megabytes config.default_images_formats = ['.jpg', '.jpeg', '.png', '.svg'] config.default_audio_formats = ['.mp3']