diff options
| author | Etienne Massip <etienne.massip@gmail.com> | 2012-12-10 19:29:21 +0000 |
|---|---|---|
| committer | Etienne Massip <etienne.massip@gmail.com> | 2012-12-10 19:29:21 +0000 |
| commit | 2304f5d42c2bb1829b1cf9055c2848db116742d3 (patch) | |
| tree | c3760ba15df5807a49f260c9036a660267eeb7ba | |
| parent | aba07a860f9583c6ee17e83f54b4002ceec50122 (diff) | |
| download | redmine-2304f5d42c2bb1829b1cf9055c2848db116742d3.tar.gz redmine-2304f5d42c2bb1829b1cf9055c2848db116742d3.zip | |
Fixed notes preview in issue history broken and hidden by a broken test.
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@10975 e93f8b46-1217-0410-a6f0-8f06a7374b81
| -rw-r--r-- | app/controllers/previews_controller.rb | 3 | ||||
| -rw-r--r-- | test/functional/previews_controller_test.rb | 2 |
2 files changed, 3 insertions, 2 deletions
diff --git a/app/controllers/previews_controller.rb b/app/controllers/previews_controller.rb index af2bc7504..9594a9fe1 100644 --- 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 27739ca11..83e2dd473 100644 --- 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) |