Fixed: Wiki Linking Fails on News Item Preview (#1661).

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

diff --git a/app/controllers/news_controller.rb b/app/controllers/news_controller.rb
index c9ba6b991994bc6160b87e3eb863593e3a3741b7..8c1a03a5b748a0e35293c48f25bd5b39bd1bb1f2 100644 (file)
--- a/app/controllers/news_controller.rb
+++ b/app/controllers/news_controller.rb
@@ -18,7 +18,7 @@
 class NewsController < ApplicationController
   layout 'base'
   before_filter :find_news, :except => [:new, :index, :preview]
-  before_filter :find_project, :only => :new
+  before_filter :find_project, :only => [:new, :preview]
   before_filter :authorize, :except => [:index, :preview]
   before_filter :find_optional_project, :only => :index
   accept_key_auth :index

diff --git a/app/views/news/edit.rhtml b/app/views/news/edit.rhtml
index a7e5e6e36603e0c1a278e5c76b68937e6bcf009d..4be566e0bc4f880b4fbf50565cea9a29bb6970a0 100644 (file)
--- a/app/views/news/edit.rhtml
+++ b/app/views/news/edit.rhtml
@@ -5,7 +5,7 @@
 <%= render :partial => 'form', :locals => { :f => f } %>
 <%= submit_tag l(:button_save) %>
 <%= link_to_remote l(:label_preview), 
-                   { :url => { :controller => 'news', :action => 'preview' },
+                   { :url => { :controller => 'news', :action => 'preview', :project_id => @project },
                      :method => 'post',
                      :update => 'preview',
                      :with => "Form.serialize('news-form')"

diff --git a/app/views/news/index.rhtml b/app/views/news/index.rhtml
index 87db8a5f7eebfe6f05c9b3853776220aab5f9011..9cac3900236b919e66117fb1b23df2bf1fc334c7 100644 (file)
--- a/app/views/news/index.rhtml
+++ b/app/views/news/index.rhtml
@@ -12,7 +12,7 @@
 <%= render :partial => 'news/form', :locals => { :f => f } %>
 <%= submit_tag l(:button_create) %>
 <%= link_to_remote l(:label_preview), 
-                   { :url => { :controller => 'news', :action => 'preview' },
+                   { :url => { :controller => 'news', :action => 'preview', :project_id => @project },
                      :method => 'post',
                      :update => 'preview',
                      :with => "Form.serialize('news-form')"

diff --git a/app/views/news/new.rhtml b/app/views/news/new.rhtml
index 9208d884052b581839e3b0e222b383934f3d5510..a4d29a0a9f6dd2bf80505f098764f658c5921059 100644 (file)
--- a/app/views/news/new.rhtml
+++ b/app/views/news/new.rhtml
@@ -5,7 +5,7 @@
 <%= render :partial => 'news/form', :locals => { :f => f } %>
 <%= submit_tag l(:button_create) %>
 <%= link_to_remote l(:label_preview), 
-                   { :url => { :controller => 'news', :action => 'preview' },
+                   { :url => { :controller => 'news', :action => 'preview', :project_id => @project },
                      :method => 'post',
                      :update => 'preview',
                      :with => "Form.serialize('news-form')"

diff --git a/app/views/news/show.rhtml b/app/views/news/show.rhtml
index cc9fe1fbba55533bc2e4916b0dbd1e772e953801..78be9c247c1e576cd20c7d88761704b326baada4 100644 (file)
--- a/app/views/news/show.rhtml
+++ b/app/views/news/show.rhtml
@@ -15,7 +15,7 @@
 <%= render :partial => 'form', :locals => { :f => f } %>
 <%= submit_tag l(:button_save) %>
 <%= link_to_remote l(:label_preview), 
-                   { :url => { :controller => 'news', :action => 'preview' },
+                   { :url => { :controller => 'news', :action => 'preview', :project_id => @project },
                      :method => 'post',
                      :update => 'preview',
                      :with => "Form.serialize('news-form')"