diff options
| author | Jean-Philippe Lang <jp_lang@yahoo.fr> | 2017-07-02 10:00:07 +0000 |
|---|---|---|
| committer | Jean-Philippe Lang <jp_lang@yahoo.fr> | 2017-07-02 10:00:07 +0000 |
| commit | a3eb6bf1f7d7b7c34ce703f35c0e045ea722a6fc (patch) | |
| tree | d41735e5dc8f1e94d29cea17ecfce37e895c0af5 | |
| parent | 2f23c707133cec88c63375acc0c33b7054d512c6 (diff) | |
| download | redmine-a3eb6bf1f7d7b7c34ce703f35c0e045ea722a6fc.tar.gz redmine-a3eb6bf1f7d7b7c34ce703f35c0e045ea722a6fc.zip | |
Merged r16738 (#26310, #25988).
git-svn-id: http://svn.redmine.org/redmine/branches/3.4-stable@16739 e93f8b46-1217-0410-a6f0-8f06a7374b81
| -rw-r--r-- | app/helpers/application_helper.rb | 2 | ||||
| -rw-r--r-- | test/unit/helpers/application_helper_test.rb | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb index 41a8056e8..52a405211 100644 --- a/app/helpers/application_helper.rb +++ b/app/helpers/application_helper.rb @@ -975,7 +975,7 @@ module ApplicationHelper attachments = options[:attachments] || [] attachments += obj.attachments if obj.respond_to?(:attachments) if attachments && attachment = Attachment.latest_attach(attachments, name) - link = link_to_attachment(attachment, :only_path => only_path, :download => true, :class => 'attachment') + link = link_to_attachment(attachment, :only_path => only_path, :class => 'attachment') end when 'project' if p = Project.visible.where("identifier = :s OR LOWER(name) = :s", :s => name.downcase).first diff --git a/test/unit/helpers/application_helper_test.rb b/test/unit/helpers/application_helper_test.rb index ca56412f7..020b4636c 100644 --- a/test/unit/helpers/application_helper_test.rb +++ b/test/unit/helpers/application_helper_test.rb @@ -667,7 +667,7 @@ RAW def test_attachment_links text = 'attachment:error281.txt' - result = link_to("error281.txt", "/attachments/download/1/error281.txt", + result = link_to("error281.txt", "/attachments/1/error281.txt", :class => "attachment") assert_equal "<p>#{result}</p>", textilizable(text, @@ -679,7 +679,7 @@ RAW set_tmp_attachments_directory a1 = Attachment.generate!(:filename => "test.txt", :created_on => 1.hour.ago) a2 = Attachment.generate!(:filename => "test.txt") - result = link_to("test.txt", "/attachments/download/#{a2.id}/test.txt", + result = link_to("test.txt", "/attachments/#{a2.id}/test.txt", :class => "attachment") assert_equal "<p>#{result}</p>", textilizable('attachment:test.txt', :attachments => [a1, a2]) |