jro_apps/redmine Commit - r10374:5a02dcf0a9f5

Fixed that issue notes preview is broken by r10547 (#1554)....

Jean-Philippe Lang -

r10374:5a02dcf0a9f5

parent child

Context file:

r10374:5a02dcf0a9f5

app/controllers/previews_controller.rb +1 -1

                   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

test/functional/previews_controller_test.rb +2 -3

               def test_preview_issue_notes
                 @request.session[:user_id] = 2
                 post :issue, :project_id => '1', :id => 1,
-                     :issue => {:description => Issue.find(1).description},
+                     :issue => {:description => Issue.find(1).description, :notes => 'Foo'}
-                     :notes => 'Foo'
                 assert_response :success
                 assert_template 'preview'
                 assert_not_nil assigns(:notes)
               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)

General Comments 0

You need to be logged in to leave comments. Login now

No TODOs yet

	Repositories
g s	Goto summary page
g c	Goto changelog page
g f	Goto files page
g F	Goto files page with file search activated
g p	Goto pull requests page
g o	Goto repository settings
g O	Goto repository access permissions settings
t s	Toggle sidebar on some pages