Fixed that magic links to existing attachments are not converted when previewing...

git-svn-id: http://svn.redmine.org/redmine/trunk@12476 e93f8b46-1217-0410-a6f0-8f06a7374b81

diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb
index fac00256582fe149c4d53d9ba60131d66e6723b0..bb7208e36075c414cbd030921dc28496b0cddc5c 100644 (file)
--- a/app/helpers/application_helper.rb
+++ b/app/helpers/application_helper.rb
@@ -847,7 +847,8 @@ module ApplicationHelper
               repo_prefix = nil
             end
           when 'attachment'
-            attachments = options[:attachments] || (obj && obj.respond_to?(:attachments) ? obj.attachments : nil)
+            attachments = options[:attachments] || []
+            attachments += obj.attachments if obj.respond_to?(:attachments)
             if attachments && attachment = Attachment.latest_attach(attachments, name)
               link = link_to_attachment(attachment, :only_path => only_path, :download => true, :class => 'attachment')
             end

diff --git a/test/functional/previews_controller_test.rb b/test/functional/previews_controller_test.rb
index f99ccb40133f1ab622974907ca75b28bcea9fcf4..490e62320cbc9d7468e52ea481f8af4c2a992746 100644 (file)
--- a/test/functional/previews_controller_test.rb
+++ b/test/functional/previews_controller_test.rb
@@ -54,6 +54,14 @@ class PreviewsControllerTest < ActionController::TestCase
     assert_tag :p, :content => 'Foo'
   end
 
+  def test_preview_issue_notes_should_support_links_to_existing_attachments
+    Attachment.generate!(:container => Issue.find(1), :filename => 'foo.bar')
+    @request.session[:user_id] = 2
+    post :issue, :project_id => '1', :id => 1, :notes => 'attachment:foo.bar'
+    assert_response :success
+    assert_select 'a.attachment', :text => 'foo.bar'
+  end
+
   def test_preview_new_news
     get :news, :project_id => 1,
                   :news => {:title => '',