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

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
2bbc948e · Jean-Philippe Lang · c499d2d1 · 2bbc948e · 2bbc948e · 2bbc948e
Commit 2bbc948e authored Mar 28, 2010 by Jean-Philippe Lang
Showing with 38 additions and 3 deletions

issues_controller.rb app/controllers/issues_controller.rb +11 -3

preview.html.erb app/views/issues/preview.html.erb +11 -0

issues_controller_test.rb test/functional/issues_controller_test.rb +16 -0

No files found.
--- 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

--- a/app/views/issues/preview.html.erb
+++ b/app/views/issues/preview.html.erb
+<% 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 %>
--- a/test/functional/issues_controller_test.rb
+++ b/test/functional/issues_controller_test.rb
@@ -1271,6 +1271,22 @@ class IssuesControllerTest < ActionController::TestCase
                            :attributes => { :href => '#',
                                             :class => 'icon-del disabled' }
  end
+  
+  def test_preview_new_issue
+    @request.session[:user_id] = 2
+    post :preview, :project_id => '1', :issue => {:description => 'Foo'}
+    assert_response :success
+    assert_template 'preview'
+    assert_not_nil assigns(:description)
+  end
+                              
+  def test_preview_notes
+    @request.session[:user_id] = 2
+    post :preview, :project_id => '1', :id => 1, :issue => {:description => Issue.find(1).description}, :notes => 'Foo'
+    assert_response :success
+    assert_template 'preview'
+    assert_not_nil assigns(:notes)
+  end

  def test_auto_complete_routing
    assert_routing(