Browse Source

Show warning when attempting to attach more than the allowed number of attachments (#18555).

Patch by Mizuki ISHIKAWA.


git-svn-id: http://svn.redmine.org/redmine/trunk@19620 e93f8b46-1217-0410-a6f0-8f06a7374b81
tags/4.2.0
Go MAEDA 4 years ago
parent
commit
bf79b3f5b3

+ 1
- 0
app/views/attachments/_form.html.erb View File

:multiple => multiple, :multiple => multiple,
:onchange => 'addInputFiles(this);', :onchange => 'addInputFiles(this);',
:data => { :data => {
:max_number_of_files_message => l(:error_attachments_too_many, :max_number_of_files => 10),
:max_file_size => Setting.attachment_max_size.to_i.kilobytes, :max_file_size => Setting.attachment_max_size.to_i.kilobytes,
:max_file_size_message => l(:error_attachment_too_big, :max_size => number_to_human_size(Setting.attachment_max_size.to_i.kilobytes)), :max_file_size_message => l(:error_attachment_too_big, :max_size => number_to_human_size(Setting.attachment_max_size.to_i.kilobytes)),
:max_concurrent_uploads => Redmine::Configuration['max_concurrent_ajax_uploads'].to_i, :max_concurrent_uploads => Redmine::Configuration['max_concurrent_ajax_uploads'].to_i,

+ 1
- 0
config/locales/en.yml View File

error_workflow_copy_target: 'Please select target tracker(s) and role(s)' error_workflow_copy_target: 'Please select target tracker(s) and role(s)'
error_unable_delete_issue_status: 'Unable to delete issue status (%{value})' error_unable_delete_issue_status: 'Unable to delete issue status (%{value})'
error_unable_to_connect: "Unable to connect (%{value})" error_unable_to_connect: "Unable to connect (%{value})"
error_attachments_too_many: "This file cannot be uploaded because it exceeds the maximum number of files that can be attached simultaneously (%{max_number_of_files})"
error_attachment_too_big: "This file cannot be uploaded because it exceeds the maximum allowed file size (%{max_size})" error_attachment_too_big: "This file cannot be uploaded because it exceeds the maximum allowed file size (%{max_size})"
error_bulk_download_size_too_big: "These attachments cannot be bulk downloaded because the total file size exceeds the maximum allowed size (%{max_size})" error_bulk_download_size_too_big: "These attachments cannot be bulk downloaded because the total file size exceeds the maximum allowed size (%{max_size})"
error_session_expired: "Your session has expired. Please login again." error_session_expired: "Your session has expired. Please login again."

+ 2
- 0
public/javascripts/attachments.js View File



addAttachment.toggle(attachmentsFields.children().length < maxFiles); addAttachment.toggle(attachmentsFields.children().length < maxFiles);
return attachmentId; return attachmentId;
} else {
alert($('input.file_selector').data('max-number-of-files-message'));
} }
return null; return null;
} }

Loading…
Cancel
Save