Refactor: Change the different find_object filters to share a common method.
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@3597 e93f8b46-1217-0410-a6f0-8f06a7374b81
This commit is contained in:
1 parent
0f999ef0e0
commit
194dab8e96
6 files changed
+29
-33
No files matched your search
@@ -17,7 +17,8 @@
|
||||
|
||||
class NewsController < ApplicationController
|
||||
default_search_scope :news
|
||||
before_filter :find_news, :except => [:new, :index, :preview]
|
||||
model_object News
|
||||
before_filter :find_model_object, :except => [:new, :index, :preview]
|
||||
before_filter :find_project_from_association, :except => [:new, :index, :preview]
|
||||
before_filter :find_project, :only => [:new, :preview]
|
||||
before_filter :authorize, :except => [:index, :preview]
|
||||
@@ -89,12 +90,6 @@ class NewsController < ApplicationController
|
||||
end
|
||||
|
||||
private
|
||||
def find_news
|
||||
@news = @object = News.find(params[:id])
|
||||
rescue ActiveRecord::RecordNotFound
|
||||
render_404
|
||||
end
|
||||
|
||||
def find_project
|
||||
@project = Project.find(params[:project_id])
|
||||
rescue ActiveRecord::RecordNotFound
|
||||
|
||||
Reference in new issue
Block a user