From c6f819edb7844bb518c23b3190b2134b23c2e43c Mon Sep 17 00:00:00 2001 From: Jeremy Kemper Date: Tue, 5 Jul 2005 01:30:44 +0000 Subject: r2827@asus: jeremy | 2005-07-04 21:30:06 -0700 precompute action_name git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@1688 5ecf4fe2-1ee6-0310-87b1-e25e094e27de --- actionpack/lib/action_controller/base.rb | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) (limited to 'actionpack/lib/action_controller/base.rb') diff --git a/actionpack/lib/action_controller/base.rb b/actionpack/lib/action_controller/base.rb index c9b0973561..15430839e7 100755 --- a/actionpack/lib/action_controller/base.rb +++ b/actionpack/lib/action_controller/base.rb @@ -275,6 +275,9 @@ module ActionController #:nodoc: # is generated by taking a snapshot of all the instance variables in the current scope just before a template is rendered. attr_accessor :assigns + # Returns the name of the action this controller is processing. + attr_accessor :action_name + class << self # Factory for the standard create, process loop where the controller is discarded after processing. def process(request, response) #:nodoc: @@ -339,6 +342,7 @@ module ActionController #:nodoc: initialize_template_class(response) assign_shortcuts(request, response) initialize_current_url + @action_name = params[:action] || 'index' log_processing unless logger.nil? send(method, *arguments) @@ -439,11 +443,6 @@ module ActionController #:nodoc: self.class.controller_name end - # Returns the name of the action this controller is processing. - def action_name - @params["action"] || "index" - end - protected # Renders the template specified by template_name, which defaults to the name of the current controller and action. # So calling +render+ in WeblogController#show will attempt to render "#{template_root}/weblog/show.rhtml" or -- cgit v1.2.3