meineerde/redmine
1
0
Fork 0
mirror of https://github.com/meineerde/redmine.git synced 2025-12-19 15:01:14 +00:00
Code Issues Releases Wiki Activity

Drag and drop file upload to file type custom field (#30776).

Browse Source 
Patch by Mizuki ISHIKAWA.


git-svn-id: http://svn.redmine.org/redmine/trunk@20712 e93f8b46-1217-0410-a6f0-8f06a7374b81
This commit is contained in:
Go MAEDA 2021-01-13 06:30:49 +00:00
parent ea08c3aa81
commit ac015d49f9
4 changed files with 19 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
app/views/attachments/_form.html.erb
View File

@ -1,9 +1,10 @@
<% attachment_param ||= 'attachments' %> <% attachment_param ||= 'attachments' %>
<% attachment_format_custom_field ||= false %>
<% saved_attachments ||= container.saved_attachments if defined?(container) && container %> <% saved_attachments ||= container.saved_attachments if defined?(container) && container %>
<% multiple = true unless defined?(multiple) && multiple == false %> <% multiple = true unless defined?(multiple) && multiple == false %>
<% show_add = multiple || saved_attachments.blank? %> <% show_add = multiple || saved_attachments.blank? %>
<% description = (defined?(description) && description == false ? false : true) %> <% description = (defined?(description) && description == false ? false : true) %>
<% css_class = (defined?(filedrop) && filedrop == false ? '' : 'filedrop') %> <% css_class = (defined?(filedrop) && filedrop == false ? '' : (attachment_format_custom_field ? 'custom-field-filedrop' : 'filedrop')) %>
<span class="attachments_form"> <span class="attachments_form">
<span class="attachments_fields"> <span class="attachments_fields">
@ -30,7 +31,7 @@
: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_number_of_files_message => l(:error_attachments_too_many, :max_number_of_files => (multiple ? 10 : 1)),
: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,

3
lib/redmine/field_format.rb
View File

@ -1070,7 +1070,8 @@ module Redmine
:multiple => false, :multiple => false,
:description => false, :description => false,
:saved_attachments => [attachment].compact, :saved_attachments => [attachment].compact,
:filedrop => false :filedrop => true,
:attachment_format_custom_field => true
}) })
end end
end end

14
public/javascripts/attachments.js
View File

@ -182,7 +182,11 @@ function handleFileDropEvent(e) {
if ($.inArray('Files', e.dataTransfer.types) > -1) { if ($.inArray('Files', e.dataTransfer.types) > -1) {
handleFileDropEvent.target = e.target; handleFileDropEvent.target = e.target;
uploadAndAttachFiles(e.dataTransfer.files, $('input:file.filedrop').first()); if ($(this).hasClass('custom-field-filedroplistner')){
uploadAndAttachFiles(e.dataTransfer.files, $(this).find('input:file.custom-field-filedrop').first());
} else {
uploadAndAttachFiles(e.dataTransfer.files, $(this).find('input:file.filedrop').first());
}
} }
} }
handleFileDropEvent.target = ''; handleFileDropEvent.target = '';
@ -211,6 +215,14 @@ function setupFileDrop() {
paste: copyImageFromClipboard paste: copyImageFromClipboard
}).addClass('filedroplistner'); }).addClass('filedroplistner');
}); });
$('form div.box input:file.custom-field-filedrop').closest('p').not('.custom-field-filedroplistner').each(function() {
$(this).on({
dragover: dragOverHandler,
dragleave: dragOutHandler,
drop: handleFileDropEvent
}).addClass('custom-field-filedroplistner');
});
} }
} }

2
public/stylesheets/application.css
View File

@ -925,7 +925,7 @@ span.required {color: #bb0000;}
a.remove-upload:hover {text-decoration:none !important;} a.remove-upload:hover {text-decoration:none !important;}
.existing-attachment.deleted .filename {text-decoration:line-through; color:#999 !important;} .existing-attachment.deleted .filename {text-decoration:line-through; color:#999 !important;}
div.fileover { background-color: lavender; } div.fileover, p.custom-field-filedroplistner.fileover { background-color: lavender; }
div.attachments p { margin:4px 0 2px 0; } div.attachments p { margin:4px 0 2px 0; }
div.attachments img { vertical-align: middle; } div.attachments img { vertical-align: middle; }