##// END OF EJS Templates
Fixed notes preview in issue history broken and hidden by a broken test....
Etienne Massip -
r10747:2304f5d42c2b
parent child
Show More
@@ -26,7 +26,8 class PreviewsController < ApplicationController
26 if @description && @description.gsub(/(\r?\n|\n\r?)/, "\n") == @issue.description.to_s.gsub(/(\r?\n|\n\r?)/, "\n")
26 if @description && @description.gsub(/(\r?\n|\n\r?)/, "\n") == @issue.description.to_s.gsub(/(\r?\n|\n\r?)/, "\n")
27 @description = nil
27 @description = nil
28 end
28 end
29 @notes = (params[:issue] ? params[:issue][:notes] : nil)
29 # params[:notes] is useful for preview of notes in issue history
30 @notes = params[:notes] || (params[:issue] ? params[:issue][:notes] : nil)
30 else
31 else
31 @description = (params[:issue] ? params[:issue][:description] : nil)
32 @description = (params[:issue] ? params[:issue][:description] : nil)
32 end
33 end
@@ -48,7 +48,7 class PreviewsControllerTest < ActionController::TestCase
48
48
49 def test_preview_journal_notes_for_update
49 def test_preview_journal_notes_for_update
50 @request.session[:user_id] = 2
50 @request.session[:user_id] = 2
51 post :issue, :project_id => '1', :id => 1, :issue => {:notes => 'Foo'}
51 post :issue, :project_id => '1', :id => 1, :notes => 'Foo'
52 assert_response :success
52 assert_response :success
53 assert_template 'preview'
53 assert_template 'preview'
54 assert_not_nil assigns(:notes)
54 assert_not_nil assigns(:notes)
General Comments 0
You need to be logged in to leave comments. Login now