diff options
| author | Jean-Philippe Lang <jp_lang@yahoo.fr> | 2010-03-28 15:17:46 +0000 |
|---|---|---|
| committer | Jean-Philippe Lang <jp_lang@yahoo.fr> | 2010-03-28 15:17:46 +0000 |
| commit | 2bbc948e06ef802588b25cf02f0de816f6fa0cc6 (patch) | |
| tree | 69f41a0113709eaa30acd67d6a6b0b7022f6ba86 /app | |
| parent | c499d2d150c7e1818e8bfe2100a284cc02966af6 (diff) | |
| download | redmine-2bbc948e06ef802588b25cf02f0de816f6fa0cc6.tar.gz redmine-2bbc948e06ef802588b25cf02f0de816f6fa0cc6.zip | |
Preview description if it was edited while updating an issue (#741).
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@3623 e93f8b46-1217-0410-a6f0-8f06a7374b81
Diffstat (limited to 'app')
| -rw-r--r-- | app/controllers/issues_controller.rb | 14 | ||||
| -rw-r--r-- | app/views/issues/preview.html.erb | 11 |
2 files changed, 22 insertions, 3 deletions
diff --git a/app/controllers/issues_controller.rb b/app/controllers/issues_controller.rb index 10c8aebc1..b97937a48 100644 --- a/app/controllers/issues_controller.rb +++ b/app/controllers/issues_controller.rb @@ -453,9 +453,17 @@ class IssuesController < ApplicationController def preview @issue = @project.issues.find_by_id(params[:id]) unless params[:id].blank? - @attachements = @issue.attachments if @issue - @text = params[:notes] || (params[:issue] ? params[:issue][:description] : nil) - render :partial => 'common/preview' + if @issue + @attachements = @issue.attachments + @description = params[:issue] && params[:issue][:description] + 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] + else + @description = (params[:issue] ? params[:issue][:description] : nil) + end + render :layout => false end def auto_complete diff --git a/app/views/issues/preview.html.erb b/app/views/issues/preview.html.erb new file mode 100644 index 000000000..23772859e --- /dev/null +++ b/app/views/issues/preview.html.erb @@ -0,0 +1,11 @@ +<% if @notes %> + <fieldset class="preview"><legend><%= l(:field_notes) %></legend> + <%= textilizable @notes, :attachments => @attachements, :object => @issue %> + </fieldset> +<% end %> + +<% if @description %> + <fieldset class="preview"><legend><%= l(:field_description) %></legend> + <%= textilizable @description, :attachments => @attachements, :object => @issue %> + </fieldset> +<% end %> |