Refactor: move NewsController#preview to PreviewsController#news

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@4174 e93f8b46-1217-0410-a6f0-8f06a7374b81

6 files changed, 17 insertions, 17 deletions

diff --git a/app/controllers/news_controller.rb b/app/controllers/news_controller.rb
index 47f467862..eebc0ba02 100644
--- a/app/controllers/news_controller.rb
+++ b/app/controllers/news_controller.rb
@@ -18,10 +18,10 @@
 class NewsController < ApplicationController
   default_search_scope :news
   model_object News
-  before_filter :find_model_object, :except => [:new, :create, :index, :preview]
-  before_filter :find_project_from_association, :except => [:new, :create, :index, :preview]
-  before_filter :find_project, :only => [:new, :create, :preview]
-  before_filter :authorize, :except => [:index, :preview]
+  before_filter :find_model_object, :except => [:new, :create, :index]
+  before_filter :find_project_from_association, :except => [:new, :create, :index]
+  before_filter :find_project, :only => [:new, :create]
+  before_filter :authorize, :except => [:index]
   before_filter :find_optional_project, :only => :index
   accept_key_auth :index
   
@@ -78,11 +78,6 @@ class NewsController < ApplicationController
     redirect_to :action => 'index', :project_id => @project
   end
   
-  def preview
-    @text = (params[:news] ? params[:news][:description] : nil)
-    render :partial => 'common/preview'
-  end
-  
 private
   def find_project
     @project = Project.find(params[:project_id])
diff --git a/app/controllers/previews_controller.rb b/app/controllers/previews_controller.rb
index e1c644653..612025cb8 100644
--- a/app/controllers/previews_controller.rb
+++ b/app/controllers/previews_controller.rb
@@ -16,6 +16,11 @@ class PreviewsController < ApplicationController
     render :layout => false
   end
 
+  def news
+    @text = (params[:news] ? params[:news][:description] : nil)
+    render :partial => 'common/preview'
+  end
+
   private
   
   def find_project
diff --git a/app/views/news/edit.rhtml b/app/views/news/edit.rhtml
index da256031d..704820089 100644
--- a/app/views/news/edit.rhtml
+++ b/app/views/news/edit.rhtml
@@ -5,8 +5,8 @@
 <%= render :partial => 'form', :locals => { :f => f } %>
 <%= submit_tag l(:button_save) %>
 <%= link_to_remote l(:label_preview), 
-                   { :url => { :controller => 'news', :action => 'preview', :project_id => @project },
-                     :method => 'post',
+                   { :url => { :controller => 'previews', :action => 'news', :project_id => @project },
+                     :method => 'get',
                      :update => 'preview',
                      :with => "Form.serialize('news-form')"
                    }, :accesskey => accesskey(:preview) %>
diff --git a/app/views/news/index.rhtml b/app/views/news/index.rhtml
index 2b53b7f72..d65bdf2f3 100644
--- a/app/views/news/index.rhtml
+++ b/app/views/news/index.rhtml
@@ -12,8 +12,8 @@
 <%= render :partial => 'news/form', :locals => { :f => f } %>
 <%= submit_tag l(:button_create) %>
 <%= link_to_remote l(:label_preview), 
-                   { :url => { :controller => 'news', :action => 'preview', :project_id => @project },
-                     :method => 'post',
+                   { :url => { :controller => 'previews', :action => 'news', :project_id => @project },
+                     :method => 'get',
                      :update => 'preview',
                      :with => "Form.serialize('news-form')"
                    }, :accesskey => accesskey(:preview) %> |
diff --git a/app/views/news/new.rhtml b/app/views/news/new.rhtml
index 74ae64ae8..929e6b874 100644
--- a/app/views/news/new.rhtml
+++ b/app/views/news/new.rhtml
@@ -5,8 +5,8 @@
 <%= render :partial => 'news/form', :locals => { :f => f } %>
 <%= submit_tag l(:button_create) %>
 <%= link_to_remote l(:label_preview), 
-                   { :url => { :controller => 'news', :action => 'preview', :project_id => @project },
-                     :method => 'post',
+                   { :url => { :controller => 'previews', :action => 'news', :project_id => @project },
+                     :method => 'get',
                      :update => 'preview',
                      :with => "Form.serialize('news-form')"
                    }, :accesskey => accesskey(:preview) %>
diff --git a/app/views/news/show.rhtml b/app/views/news/show.rhtml
index 7861a3d01..af93af261 100644
--- a/app/views/news/show.rhtml
+++ b/app/views/news/show.rhtml
@@ -16,8 +16,8 @@
 <%= render :partial => 'form', :locals => { :f => f } %>
 <%= submit_tag l(:button_save) %>
 <%= link_to_remote l(:label_preview), 
-                   { :url => { :controller => 'news', :action => 'preview', :project_id => @project },
-                     :method => 'post',
+                   { :url => { :controller => 'previews', :action => 'news', :project_id => @project },
+                     :method => 'get',
                      :update => 'preview',
                      :with => "Form.serialize('news-form')"
                    }, :accesskey => accesskey(:preview) %> |