Merged r10975 from trunk (#12566).

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/2.2-stable@11002 e93f8b46-1217-0410-a6f0-8f06a7374b81

diff --git a/app/controllers/previews_controller.rb b/app/controllers/previews_controller.rb
index af2bc75040e98d5c7ac18762cc2fac54b425d617..9594a9fe1ce9927462716870716d0d1c51affb17 100644 (file)
--- a/app/controllers/previews_controller.rb
+++ b/app/controllers/previews_controller.rb
@@ -26,7 +26,8 @@ class PreviewsController < ApplicationController
       if @description && @description.gsub(/(\r?\n|\n\r?)/, "\n") == @issue.description.to_s.gsub(/(\r?\n|\n\r?)/, "\n")
         @description = nil
       end
-      @notes = (params[:issue] ? params[:issue][:notes] : nil)
+      # params[:notes] is useful for preview of notes in issue history
+      @notes = params[:notes] || (params[:issue] ? params[:issue][:notes] : nil)
     else
       @description = (params[:issue] ? params[:issue][:description] : nil)
     end

diff --git a/test/functional/previews_controller_test.rb b/test/functional/previews_controller_test.rb
index 27739ca11f57af09f841af21fa31094697345310..83e2dd4736fee2331e36d96107d41b4b85cdc36b 100644 (file)
--- a/test/functional/previews_controller_test.rb
+++ b/test/functional/previews_controller_test.rb
@@ -48,7 +48,7 @@ class PreviewsControllerTest < ActionController::TestCase
 
   def test_preview_journal_notes_for_update
     @request.session[:user_id] = 2
-    post :issue, :project_id => '1', :id => 1, :issue => {:notes => 'Foo'}
+    post :issue, :project_id => '1', :id => 1, :notes => 'Foo'
     assert_response :success
     assert_template 'preview'
     assert_not_nil assigns(:notes)