Refactor: move NewsController#preview to PreviewsController#news
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@4174 e93f8b46-1217-0410-a6f0-8f06a7374b81
This commit is contained in:
@@ -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])
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -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) %>
|
||||
|
||||
@@ -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) %> |
|
||||
|
||||
@@ -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) %>
|
||||
|
||||
@@ -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) %> |
|
||||
|
||||
Reference in New Issue
Block a user