ソースを参照

Show attachment view even is no preview is available (#22482).

Patch by Gregor Schmidt.

git-svn-id: http://svn.redmine.org/redmine/trunk@15398 e93f8b46-1217-0410-a6f0-8f06a7374b81
tags/3.3.0
Jean-Philippe Lang 8年前
コミット
b553b23e6b

+ 1
- 1
app/controllers/attachments_controller.rb ファイルの表示

@@ -43,7 +43,7 @@ class AttachmentsController < ApplicationController
elsif @attachment.is_image?
render :action => 'image'
else
download
render :action => 'other'
end
}
format.api

+ 3
- 0
app/views/attachments/other.html.erb ファイルの表示

@@ -0,0 +1,3 @@
<%= render :layout => 'layouts/file' do %>
<%= render :partial => 'common/other' %>
<% end %>

+ 6
- 4
test/functional/attachments_controller_test.rb ファイルの表示

@@ -179,12 +179,13 @@ class AttachmentsControllerTest < ActionController::TestCase
end
end

def test_show_text_file_should_send_if_too_big
def test_show_text_file_should_show_other_if_too_big
with_settings :file_max_size_displayed => 512 do
Attachment.find(4).update_attribute :filesize, 754.kilobyte
get :show, :id => 4
assert_response :success
assert_equal 'application/x-ruby', @response.content_type
assert_template 'other'
assert_equal 'text/html', @response.content_type
end
set_tmp_attachments_directory
end
@@ -200,8 +201,9 @@ class AttachmentsControllerTest < ActionController::TestCase

def test_show_other
get :show, :id => 6
assert_response :success
assert_equal 'application/zip', @response.content_type
assert_template 'other'
assert_equal 'text/html', @response.content_type
assert_select '.nodata', :text => 'No preview available'
set_tmp_attachments_directory
end


読み込み中…
キャンセル
保存