Use #find_project_by_project_id from super-class.
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@9172 e93f8b46-1217-0410-a6f0-8f06a7374b81
This commit is contained in:
parent
aebaaad85a
commit
125f5e1710
@ -20,7 +20,7 @@ class NewsController < ApplicationController
|
|||||||
model_object News
|
model_object News
|
||||||
before_filter :find_model_object, :except => [:new, :create, :index]
|
before_filter :find_model_object, :except => [:new, :create, :index]
|
||||||
before_filter :find_project_from_association, :except => [:new, :create, :index]
|
before_filter :find_project_from_association, :except => [:new, :create, :index]
|
||||||
before_filter :find_project, :only => [:new, :create]
|
before_filter :find_project_by_project_id, :only => [:new, :create]
|
||||||
before_filter :authorize, :except => [:index]
|
before_filter :authorize, :except => [:index]
|
||||||
before_filter :find_optional_project, :only => :index
|
before_filter :find_optional_project, :only => :index
|
||||||
accept_rss_auth :index
|
accept_rss_auth :index
|
||||||
@ -99,12 +99,7 @@ class NewsController < ApplicationController
|
|||||||
redirect_to :action => 'index', :project_id => @project
|
redirect_to :action => 'index', :project_id => @project
|
||||||
end
|
end
|
||||||
|
|
||||||
private
|
private
|
||||||
def find_project
|
|
||||||
@project = Project.find(params[:project_id])
|
|
||||||
rescue ActiveRecord::RecordNotFound
|
|
||||||
render_404
|
|
||||||
end
|
|
||||||
|
|
||||||
def find_optional_project
|
def find_optional_project
|
||||||
return true unless params[:project_id]
|
return true unless params[:project_id]
|
||||||
|
Loading…
x
Reference in New Issue
Block a user