kolan
/
Redmine
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Better message for file size validation error. 

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@8937 e93f8b46-1217-0410-a6f0-8f06a7374b81
This commit is contained in:
Jean-Philippe Lang 2012-02-23 12:18:10 +00:00
parent 9774782cab
commit 7e347069d5
2 changed files with 12 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/models/attachment.rb
View File

@ -68,7 +68,7 @@ class Attachment < ActiveRecord::Base
def validate_max_file_size
if @temp_file && self.filesize > Setting.attachment_max_size.to_i.kilobytes
errors.add(:base, :too_long, :count => Setting.attachment_max_size.to_i.kilobytes)
errors.add(:base, l(:error_attachment_too_big, :max_size => Setting.attachment_max_size.to_i.kilobytes))
end
end

11
test/integration/api_test/attachments_test.rb
View File

@ -116,5 +116,16 @@ class ApiTest::AttachmentsTest < ActionController::IntegrationTest
assert_response 406
end
end
should "return errors if file is too big" do
set_tmp_attachments_directory
with_settings :attachment_max_size => 1 do
assert_no_difference 'Attachment.count' do
post '/uploads.xml', ('x' * 2048), {'Content-Type' => 'application/octet-stream'}.merge(credentials('jsmith'))
assert_response 422
assert_tag 'error', :content => /exceeds the maximum allowed file size/
end
end
end
end
end