Refactor: Pull up #find_optional_project to ApplicationController.

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

Refactor: Pull up #find_optional_project to ApplicationController.
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@3716 e93f8b46-1217-0410-a6f0-8f06a7374b81
306ca5e7 · Eric Davis · f65c47e3 · 306ca5e7 · 306ca5e7 · 306ca5e7
Commit 306ca5e7 authored Apr 30, 2010 by Eric Davis
Showing with 10 additions and 19 deletions

application_controller.rb app/controllers/application_controller.rb +10 -0

gantts_controller.rb app/controllers/gantts_controller.rb +0 -11

issues_controller.rb app/controllers/issues_controller.rb +0 -8

No files found.
--- a/app/controllers/application_controller.rb
+++ b/app/controllers/application_controller.rb
@@ -168,6 +168,16 @@ class ApplicationController < ActionController::Base
    render_404
  end

+  # Find a project based on params[:project_id]
+  # TODO: some subclasses override this, see about merging their logic
+  def find_optional_project
+    @project = Project.find(params[:project_id]) unless params[:project_id].blank?
+    allowed = User.current.allowed_to?({:controller => params[:controller], :action => params[:action]}, @project, :global => true)
+    allowed ? true : deny_access
+  rescue ActiveRecord::RecordNotFound
+    render_404
+  end
+
  # Finds and sets @project based on @object.project
  def find_project_from_association
    render_404 unless @object.present?

--- a/app/controllers/gantts_controller.rb
+++ b/app/controllers/gantts_controller.rb
@@ -42,15 +42,4 @@ class GanttsController < ApplicationController
    end
  end

-  private
-
-  # TODO: Refactor, duplicates IssuesController
-  def find_optional_project
-    @project = Project.find(params[:project_id]) unless params[:project_id].blank?
-    allowed = User.current.allowed_to?({:controller => params[:controller], :action => params[:action]}, @project, :global => true)
-    allowed ? true : deny_access
-  rescue ActiveRecord::RecordNotFound
-    render_404
-  end
-
 end
--- a/app/controllers/issues_controller.rb
+++ b/app/controllers/issues_controller.rb
@@ -445,14 +445,6 @@ private
    render_404
  end
  
-  def find_optional_project
-    @project = Project.find(params[:project_id]) unless params[:project_id].blank?
-    allowed = User.current.allowed_to?({:controller => params[:controller], :action => params[:action]}, @project, :global => true)
-    allowed ? true : deny_access
-  rescue ActiveRecord::RecordNotFound
-    render_404
-  end
-
  # Used by #edit and #update to set some common instance variables
  # from the params
  # TODO: Refactor, not everything in here is needed by #edit