Fixed: error when previewing a new wiki page (#1292) introduced in r1415.

git-svn-id: http://redmine.rubyforge.org/svn/trunk@1445 e93f8b46-1217-0410-a6f0-8f06a7374b81

diff --git a/app/controllers/wiki_controller.rb b/app/controllers/wiki_controller.rb
index 44113ebf3abc3b10a7afd6be99ba5af9802e989a..8655cfed7fc9484564498b511e958b2ffa386c0f 100644 (file)
--- a/app/controllers/wiki_controller.rb
+++ b/app/controllers/wiki_controller.rb
@@ -162,7 +162,8 @@ class WikiController < ApplicationController
   
   def preview
     page = @wiki.find_page(params[:page])
-    return render_403 unless editable?(page)
+    # page is nil when previewing a new page
+    return render_403 unless page.nil? || editable?(page)
     @attachements = page.attachments if page
     @text = params[:content][:text]
     render :partial => 'common/preview'

diff --git a/test/functional/wiki_controller_test.rb b/test/functional/wiki_controller_test.rb
index 8688c2e03138568346157c9465a6127e4b59e61e..f1ae7a9c25bd6c5083700502f5e931e2c05226c5 100644 (file)
--- a/test/functional/wiki_controller_test.rb
+++ b/test/functional/wiki_controller_test.rb
@@ -86,6 +86,17 @@ class WikiControllerTest < Test::Unit::TestCase
     assert_tag :tag => 'strong', :content => /previewed text/
   end
   
+  def test_preview_new_page
+    @request.session[:user_id] = 2
+    xhr :post, :preview, :id => 1, :page => 'New page',
+                                   :content => { :text => 'h1. New page',
+                                                 :comments => '',
+                                                 :version => 0 }
+    assert_response :success
+    assert_template 'common/_preview'
+    assert_tag :tag => 'h1', :content => /New page/
+  end
+  
   def test_history
     get :history, :id => 1, :page => 'CookBook_documentation'
     assert_response :success