kolan/Redmine
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merged r10975 from trunk (#12566).

Browse Source 
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/2.2-stable@11002 e93f8b46-1217-0410-a6f0-8f06a7374b81
This commit is contained in:
Jean-Philippe Lang 2012-12-15 07:49:31 +00:00
parent 9d3d932703
commit 3717fdfa79
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
app/controllers/previews_controller.rb
View File

@ -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

2
test/functional/previews_controller_test.rb
View File

@ -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)