From 5a02dcf0a9f5bbd8537b2bab8857eabd4b7b1253 Mon Sep 17 00:00:00 2001 From: Jean-Philippe Lang Date: Tue, 9 Oct 2012 19:11:49 +0000 Subject: [PATCH] Fixed that issue notes preview is broken by r10547 (#1554). git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@10585 e93f8b46-1217-0410-a6f0-8f06a7374b81 --- app/controllers/previews_controller.rb | 2 +- test/functional/previews_controller_test.rb | 5 ++--- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/app/controllers/previews_controller.rb b/app/controllers/previews_controller.rb index cd947148d..af2bc7504 100644 --- a/app/controllers/previews_controller.rb +++ b/app/controllers/previews_controller.rb @@ -26,7 +26,7 @@ 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[:notes] + @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 67264e76b..27739ca11 100644 --- a/test/functional/previews_controller_test.rb +++ b/test/functional/previews_controller_test.rb @@ -40,8 +40,7 @@ class PreviewsControllerTest < ActionController::TestCase def test_preview_issue_notes @request.session[:user_id] = 2 post :issue, :project_id => '1', :id => 1, - :issue => {:description => Issue.find(1).description}, - :notes => 'Foo' + :issue => {:description => Issue.find(1).description, :notes => 'Foo'} assert_response :success assert_template 'preview' assert_not_nil assigns(:notes) @@ -49,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, :notes => 'Foo' + post :issue, :project_id => '1', :id => 1, :issue => {:notes => 'Foo'} assert_response :success assert_template 'preview' assert_not_nil assigns(:notes)