diff options
| author | Go MAEDA <maeda@farend.jp> | 2018-07-02 03:04:04 +0000 |
|---|---|---|
| committer | Go MAEDA <maeda@farend.jp> | 2018-07-02 03:04:04 +0000 |
| commit | 7d00558aeab94eef3d96f9f651c5f53a5e493c5f (patch) | |
| tree | 5b18aba15b85eceedd8875ac4b94831c3a9c5df7 | |
| parent | 7e4798cdb18760045df7ff71f06d027e6c6b77a5 (diff) | |
| download | redmine-7d00558aeab94eef3d96f9f651c5f53a5e493c5f.tar.gz redmine-7d00558aeab94eef3d96f9f651c5f53a5e493c5f.zip | |
Merged r17428 from trunk to 3.3-stable (#29038).
git-svn-id: http://svn.redmine.org/redmine/branches/3.3-stable@17430 e93f8b46-1217-0410-a6f0-8f06a7374b81
| -rw-r--r-- | app/models/attachment.rb | 2 | ||||
| -rw-r--r-- | test/unit/attachment_test.rb | 1 |
2 files changed, 2 insertions, 1 deletions
diff --git a/app/models/attachment.rb b/app/models/attachment.rb index 2b13118b1..db80db396 100644 --- a/app/models/attachment.rb +++ b/app/models/attachment.rb @@ -152,7 +152,7 @@ class Attachment < ActiveRecord::Base end def title - title = filename.to_s + title = filename.dup if description.present? title << " (#{description})" end diff --git a/test/unit/attachment_test.rb b/test/unit/attachment_test.rb index c2f612405..45061fe48 100644 --- a/test/unit/attachment_test.rb +++ b/test/unit/attachment_test.rb @@ -242,6 +242,7 @@ class AttachmentTest < ActiveSupport::TestCase a = Attachment.new(:filename => "test.png", :description => "Cool image") assert_equal "test.png (Cool image)", a.title + assert_equal "test.png", a.filename end def test_new_attachment_should_be_editable_by_author |