From 39e7bab2b9aed464973ef35a6c0b63ec774a0ad0 Mon Sep 17 00:00:00 2001 From: Jean-Philippe Lang Date: Sat, 15 Dec 2012 10:03:34 +0000 Subject: [PATCH] Save the selected file just in case uploading stuff fails/is not supported. git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@11010 e93f8b46-1217-0410-a6f0-8f06a7374b81 --- app/views/attachments/_form.html.erb | 3 ++- public/javascripts/attachments.js | 3 +-- test/functional/issues_controller_test.rb | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/app/views/attachments/_form.html.erb b/app/views/attachments/_form.html.erb index ca7558a70..65ad8804a 100644 --- a/app/views/attachments/_form.html.erb +++ b/app/views/attachments/_form.html.erb @@ -11,8 +11,9 @@ <% end %> -<%= file_field_tag 'attachments_files', +<%= file_field_tag 'attachments[dummy][file]', :id => nil, + :class => 'file_selector', :multiple => true, :onchange => 'addInputFiles(this);', :data => { diff --git a/public/javascripts/attachments.js b/public/javascripts/attachments.js index e99f2ac7c..deac4eb00 100644 --- a/public/javascripts/attachments.js +++ b/public/javascripts/attachments.js @@ -156,8 +156,7 @@ function handleFileDropEvent(e) { blockEventPropagation(e); if ($.inArray('Files', e.dataTransfer.types) > -1) { - - uploadAndAttachFiles(e.dataTransfer.files, $('input:file[name=attachments_files]')); + uploadAndAttachFiles(e.dataTransfer.files, $('input:file.file_selector')); } } diff --git a/test/functional/issues_controller_test.rb b/test/functional/issues_controller_test.rb index 6c0ea7fca..f3632e83d 100644 --- a/test/functional/issues_controller_test.rb +++ b/test/functional/issues_controller_test.rb @@ -1000,7 +1000,7 @@ class IssuesControllerTest < ActionController::TestCase get :show, :id => 1 assert_select 'form#issue-form[method=post][enctype=multipart/form-data]' do - assert_select 'input[type=file][name=?]', 'attachments_files' + assert_select 'input[type=file][name=?]', 'attachments[dummy][file]' end end @@ -1569,7 +1569,7 @@ class IssuesControllerTest < ActionController::TestCase get :new, :project_id => 1, :tracker_id => 1 assert_select 'form[id=issue-form][method=post][enctype=multipart/form-data]' do - assert_select 'input[name=?][type=file]', 'attachments_files' + assert_select 'input[name=?][type=file]', 'attachments[dummy][file]' end end -- 2.39.5