From 35bb707b918d58e23d9a784a9226cade5304a08d Mon Sep 17 00:00:00 2001 From: Jean-Philippe Lang Date: Thu, 13 Apr 2017 12:15:21 +0000 Subject: Preview when editing journal notes broken by r15621. git-svn-id: http://svn.redmine.org/redmine/trunk@16542 e93f8b46-1217-0410-a6f0-8f06a7374b81 --- app/controllers/previews_controller.rb | 4 ++-- app/views/journals/_notes_form.html.erb | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) (limited to 'app') diff --git a/app/controllers/previews_controller.rb b/app/controllers/previews_controller.rb index 698816e44..d81560c13 100644 --- a/app/controllers/previews_controller.rb +++ b/app/controllers/previews_controller.rb @@ -25,8 +25,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 - # params[:notes] is useful for preview of notes in issue history - @notes = params[:notes] || (params[:issue] ? params[:issue][:notes] : nil) + @notes = params[:journal] ? params[:journal][:notes] : nil + @notes ||= params[:issue] ? params[:issue][:notes] : nil else @description = (params[:issue] ? params[:issue][:description] : nil) end diff --git a/app/views/journals/_notes_form.html.erb b/app/views/journals/_notes_form.html.erb index 3bd6a31fd..2ab978769 100644 --- a/app/views/journals/_notes_form.html.erb +++ b/app/views/journals/_notes_form.html.erb @@ -2,7 +2,7 @@ :remote => true, :method => 'put', :id => "journal-#{@journal.id}-form") do %> - <%= label_tag "notes", l(:description_notes), :class => "hidden-for-sighted" %> + <%= label_tag "notes", l(:description_notes), :class => "hidden-for-sighted", :for => "journal_#{@journal.id}_notes" %> <%= text_area_tag 'journal[notes]', @journal.notes, :id => "journal_#{@journal.id}_notes", :class => 'wiki-edit', -- cgit v1.2.3