浏览代码

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 年前
父节点
当前提交
bf79b3f5b3
共有 3 个文件被更改,包括 4 次插入0 次删除
  1. 1
    0
      app/views/attachments/_form.html.erb
  2. 1
    0
      config/locales/en.yml
  3. 2
    0
      public/javascripts/attachments.js

+ 1
- 0
app/views/attachments/_form.html.erb 查看文件

@@ -30,6 +30,7 @@
:multiple => multiple,
:onchange => 'addInputFiles(this);',
: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_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,

+ 1
- 0
config/locales/en.yml 查看文件

@@ -213,6 +213,7 @@ en:
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_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_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."

+ 2
- 0
public/javascripts/attachments.js 查看文件

@@ -29,6 +29,8 @@ function addFile(inputEl, file, eagerUpload) {

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

正在加载...
取消
保存