From b21af3eaa4363b5faa29d2bbdf450bca93104cfd Mon Sep 17 00:00:00 2001 From: Jean-Philippe Lang Date: Sat, 17 Jun 2017 07:28:10 +0000 Subject: [PATCH] Preview files by default instead of downloading them (#25988). Patch by Go MAEDA. git-svn-id: http://svn.redmine.org/redmine/trunk@16665 e93f8b46-1217-0410-a6f0-8f06a7374b81 --- app/helpers/application_helper.rb | 2 +- .../lib/redmine/field_format/attachment_format_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 4915cddad..32d7c9640 100644 --- a/app/helpers/application_helper.rb +++ b/app/helpers/application_helper.rb @@ -198,7 +198,7 @@ module ApplicationHelper when 'Issue' object.visible? && html ? link_to_issue(object) : "##{object.id}" when 'Attachment' - html ? link_to_attachment(object, :download => true) : object.filename + html ? link_to_attachment(object) : object.filename when 'CustomValue', 'CustomFieldValue' if object.custom_field f = object.custom_field.format.formatted_custom_value(self, object, html) diff --git a/test/integration/lib/redmine/field_format/attachment_format_test.rb b/test/integration/lib/redmine/field_format/attachment_format_test.rb index d0debbb9f..bb1944388 100644 --- a/test/integration/lib/redmine/field_format/attachment_format_test.rb +++ b/test/integration/lib/redmine/field_format/attachment_format_test.rb @@ -82,10 +82,10 @@ class AttachmentFieldFormatTest < Redmine::IntegrationTest assert_equal 1, link.size assert_equal "testfile.txt", link.text - # download the attachment + # preview the attachment get link.attr('href') assert_response :success - assert_equal "text/plain", response.content_type + assert_template :file end def test_create_without_attachment