jro_apps/redmine Commit - r3483:194dab8e96f6

Refactor: Change the different find_object filters to share a common method....

Eric Davis -

r3483:194dab8e96f6

parent child

Context file:

r3483:194dab8e96f6

app/controllers/application_controller.rb +14 0

@@ -176,6 +176,20 class ApplicationController < ActionController::Base
176	render_404	176	render_404
177	end	177	end
178		178
		179	def find_model_object
		180	model = self.class.read_inheritable_attribute('model_object')
		181	if model
		182	@object = model.find(params[:id])
		183	self.instance_variable_set('@' + controller_name.singularize, @object) if @object
		184	end
		185	rescue ActiveRecord::RecordNotFound
		186	render_404
		187	end
		188
		189	def self.model_object(model)
		190	write_inheritable_attribute('model_object', model)
		191	end
		192
179	# make sure that the user is a member of the project (or admin) if project is private	193	# make sure that the user is a member of the project (or admin) if project is private
180	# used as a before_filter for actions that do not require any particular permission on the project	194	# used as a before_filter for actions that do not require any particular permission on the project
181	def check_project_privacy	195	def check_project_privacy

app/controllers/documents_controller.rb +2 -7

             class DocumentsController < ApplicationController
               default_search_scope :documents
+              model_object Document
               before_filter :find_project, :only => [:index, :new]
-              before_filter :find_document, :except => [:index, :new]
+              before_filter :find_model_object, :except => [:index, :new]
               before_filter :find_project_from_association, :except => [:index, :new]
               before_filter :authorize
               rescue ActiveRecord::RecordNotFound
                 render_404
               end
-              def find_document
-                @document = @object = Document.find(params[:id])
-              rescue ActiveRecord::RecordNotFound
-                render_404
-              end
             end

app/controllers/issue_categories_controller.rb +7 -5

             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
               end
             private
-              def find_category
+              # Wrap ApplicationController's find_model_object method to set
-                @category = @object = IssueCategory.find(params[:id])
+              # @category instead of just @issue_category
-              rescue ActiveRecord::RecordNotFound
+              def find_model_object
-                render_404
+                super
+                @category = @object
               end
               def find_project

app/controllers/members_controller.rb +2 -7

             # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
             class MembersController < ApplicationController
-              before_filter :find_member, :except => [:new, :autocomplete_for_member]
+              model_object Member
+              before_filter :find_model_object, :except => [:new, :autocomplete_for_member]
               before_filter :find_project_from_association, :except => [:new, :autocomplete_for_member]
               before_filter :find_project, :only => [:new, :autocomplete_for_member]
               before_filter :authorize
                 render :layout => false
               end
-            private
-              def find_member
-                @member = @object = Member.find(params[:id])
-              rescue ActiveRecord::RecordNotFound
-                render_404
-              end
             end

app/controllers/news_controller.rb +2 -7

             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]
               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

app/controllers/versions_controller.rb +2 -7

             class VersionsController < ApplicationController
               menu_item :roadmap
-              before_filter :find_version, :except => [:new, :close_completed]
+              model_object Version
+              before_filter :find_model_object, :except => [:new, :close_completed]
               before_filter :find_project_from_association, :except => [:new, :close_completed]
               before_filter :find_project, :only => [:new, :close_completed]
               before_filter :authorize
               end
             private
-              def find_version
-                @version = @object = Version.find(params[:id])
-              rescue ActiveRecord::RecordNotFound
-                render_404
-              end
               def find_project
                 @project = Project.find(params[:project_id])
               rescue ActiveRecord::RecordNotFound

General Comments 0

You need to be logged in to leave comments. Login now

No TODOs yet

	Repositories
g s	Goto summary page
g c	Goto changelog page
g f	Goto files page
g F	Goto files page with file search activated
g p	Goto pull requests page
g o	Goto repository settings
g O	Goto repository access permissions settings
t s	Toggle sidebar on some pages