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

1 files changed, 7 insertions, 5 deletions

diff --git a/app/controllers/issue_categories_controller.rb b/app/controllers/issue_categories_controller.rb
index 2904c2399..a43a767bb 100644
--- a/app/controllers/issue_categories_controller.rb
+++ b/app/controllers/issue_categories_controller.rb
@@ -17,7 +17,8 @@
 
 class IssueCategoriesController < ApplicationController
   menu_item :settings
-  before_filter :find_category, :except => :new
+  model_object IssueCategory
+  before_filter :find_model_object, :except => :new
   before_filter :find_project_from_association, :except => :new
   before_filter :find_project, :only => :new
   before_filter :authorize
@@ -73,10 +74,11 @@ class IssueCategoriesController < ApplicationController
   end
 
 private
-  def find_category
-    @category = @object = IssueCategory.find(params[:id])
-  rescue ActiveRecord::RecordNotFound
-    render_404
+  # Wrap ApplicationController's find_model_object method to set
+  # @category instead of just @issue_category
+  def find_model_object
+    super
+    @category = @object
   end    
   
   def find_project