| @@ -20,7 +20,7 class NewsController < ApplicationController | |||||
| 20 | model_object News |
|
20 | model_object News | |
| 21 | before_filter :find_model_object, :except => [:new, :create, :index] |
|
21 | before_filter :find_model_object, :except => [:new, :create, :index] | |
| 22 | before_filter :find_project_from_association, :except => [:new, :create, :index] |
|
22 | before_filter :find_project_from_association, :except => [:new, :create, :index] | |
| 23 | before_filter :find_project, :only => [:new, :create] |
|
23 | before_filter :find_project_by_project_id, :only => [:new, :create] | |
| 24 | before_filter :authorize, :except => [:index] |
|
24 | before_filter :authorize, :except => [:index] | |
| 25 | before_filter :find_optional_project, :only => :index |
|
25 | before_filter :find_optional_project, :only => :index | |
| 26 | accept_rss_auth :index |
|
26 | accept_rss_auth :index | |
| @@ -99,12 +99,7 class NewsController < ApplicationController | |||||
| 99 | redirect_to :action => 'index', :project_id => @project |
|
99 | redirect_to :action => 'index', :project_id => @project | |
| 100 | end |
|
100 | end | |
| 101 |
|
101 | |||
| 102 | private |
|
102 | private | |
| 103 | def find_project |
|
|||
| 104 | @project = Project.find(params[:project_id]) |
|
|||
| 105 | rescue ActiveRecord::RecordNotFound |
|
|||
| 106 | render_404 |
|
|||
| 107 | end |
|
|||
| 108 |
|
103 | |||
| 109 | def find_optional_project |
|
104 | def find_optional_project | |
| 110 | return true unless params[:project_id] |
|
105 | return true unless params[:project_id] | |
General Comments 0
You need to be logged in to leave comments.
Login now