Changeset 748
- Timestamp:
- 02/22/05 17:10:00 (4 years ago)
- Files:
Legend:
- Unmodified
- Added
- Removed
- Modified
- Copied
- Moved
trunk/actionpack/lib/action_controller/components.rb
r747 r748 6 6 base.helper do 7 7 def render_component(options) 8 @controller.logger.info("Start rendering component (#{options.inspect}): ") 9 result = @controller.send(:component_response, options ).body10 @controller.logger.info("\n\nEnd of component rendering") 8 @controller.logger.info("Start rendering component (#{options.inspect}): ") unless @controller.logger.nil? 9 result = @controller.send(:component_response, options, false).body 10 @controller.logger.info("\n\nEnd of component rendering") unless @controller.logger.nil? 11 11 return result 12 12 end … … 16 16 protected 17 17 def render_component(options = {}) #:doc: 18 response = component_response(options , true)19 logger.info "Start rendering component (#{options.inspect}): "18 response = component_response(options) 19 logger.info("Start rendering component (#{options.inspect}): ") unless logger.nil? 20 20 result = render_text(response.body, response.headers["Status"]) 21 logger.info("\n\nEnd of component rendering") 21 logger.info("\n\nEnd of component rendering") unless logger.nil? 22 22 return result 23 23 end 24 24 25 25 private 26 def component_response(options, reuse_response = false)26 def component_response(options, reuse_response = true) 27 27 component_class(options).process(request_for_component(options), reuse_response ? @response : response_for_component) 28 28 end … … 42 42 43 43 def response_for_component 44 Marshal::load(Marshal::dump(@response))44 @response.dup 45 45 end 46 46 end
