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

Adds Attachment#title. 

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@10012 e93f8b46-1217-0410-a6f0-8f06a7374b81
This commit is contained in:
Jean-Philippe Lang 2012-07-16 16:42:23 +00:00
parent 570e1b1d62
commit 5c2de4dfc9
2 changed files with 16 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
app/models/attachment.rb
View File

@ -137,6 +137,14 @@ class Attachment < ActiveRecord::Base
File.join(self.class.storage_path, disk_filename.to_s) File.join(self.class.storage_path, disk_filename.to_s)
end end
def title
title = filename.to_s
if description.present?
title << " (#{description})"
end
title
end
def increment_download def increment_download
increment!(:downloads) increment!(:downloads)
end end

8
test/unit/attachment_test.rb
View File

@ -150,6 +150,14 @@ class AttachmentTest < ActiveSupport::TestCase
assert_equal 'cbb5b0f30978ba03731d61f9f6d10011', Attachment.disk_filename("test_accentué.ça")[13..-1] assert_equal 'cbb5b0f30978ba03731d61f9f6d10011', Attachment.disk_filename("test_accentué.ça")[13..-1]
end end
def test_title
a = Attachment.new(:filename => "test.png")
assert_equal "test.png", a.title
a = Attachment.new(:filename => "test.png", :description => "Cool image")
assert_equal "test.png (Cool image)", a.title
end
def test_prune_should_destroy_old_unattached_attachments def test_prune_should_destroy_old_unattached_attachments
Attachment.create!(:file => uploaded_test_file("testfile.txt", ""), :author_id => 1, :created_on => 2.days.ago) Attachment.create!(:file => uploaded_test_file("testfile.txt", ""), :author_id => 1, :created_on => 2.days.ago)
Attachment.create!(:file => uploaded_test_file("testfile.txt", ""), :author_id => 1, :created_on => 2.days.ago) Attachment.create!(:file => uploaded_test_file("testfile.txt", ""), :author_id => 1, :created_on => 2.days.ago)