diff options
| author | Yehuda Katz + Carl Lerche <ykatz+clerche@engineyard.com> | 2009-05-22 17:15:46 -0700 |
|---|---|---|
| committer | Yehuda Katz + Carl Lerche <ykatz+clerche@engineyard.com> | 2009-05-22 17:17:16 -0700 |
| commit | 69a1ea8b5d4befe93ca4d11c052e831c7bd2e2b2 (patch) | |
| tree | 49a3f9a53a7ec07a37f3a818878be618ef643ff1 /actionpack/lib/action_controller | |
| parent | da9e53ec3b92fd583346896dd15c5b2533c8af6a (diff) | |
| download | rails-69a1ea8b5d4befe93ca4d11c052e831c7bd2e2b2.tar.gz rails-69a1ea8b5d4befe93ca4d11c052e831c7bd2e2b2.tar.bz2 rails-69a1ea8b5d4befe93ca4d11c052e831c7bd2e2b2.zip | |
Created an ActionController::Renderers::All that includes all the default render options (:json, :js, :rjs, :xml)
Diffstat (limited to 'actionpack/lib/action_controller')
| -rw-r--r-- | actionpack/lib/action_controller/new_base/base.rb | 5 | ||||
| -rw-r--r-- | actionpack/lib/action_controller/new_base/render_options.rb | 11 |
2 files changed, 12 insertions, 4 deletions
diff --git a/actionpack/lib/action_controller/new_base/base.rb b/actionpack/lib/action_controller/new_base/base.rb index adb760ea7e..ffe608ade4 100644 --- a/actionpack/lib/action_controller/new_base/base.rb +++ b/actionpack/lib/action_controller/new_base/base.rb @@ -11,10 +11,7 @@ module ActionController include ActionController::UrlFor include ActionController::Redirector include ActionController::Renderer - include ActionController::Renderers::Json - include ActionController::Renderers::Js - include ActionController::Renderers::Xml - include ActionController::Renderers::Rjs + include ActionController::Renderers::All include ActionController::Layouts include ActionController::ConditionalGet diff --git a/actionpack/lib/action_controller/new_base/render_options.rb b/actionpack/lib/action_controller/new_base/render_options.rb index 33f8957f6e..581a92cb7b 100644 --- a/actionpack/lib/action_controller/new_base/render_options.rb +++ b/actionpack/lib/action_controller/new_base/render_options.rb @@ -92,5 +92,16 @@ module ActionController self.response_body = generator.to_s end end + + module All + extend ActiveSupport::DependencyModule + + included do + include ::ActionController::Renderers::Json + include ::ActionController::Renderers::Js + include ::ActionController::Renderers::Xml + include ::ActionController::Renderers::Rjs + end + end end end |