mirror of
https://github.com/rails/rails.git
synced 2022-11-09 12:12:34 -05:00
Rename the RenderingController module to just plain Rendering
This commit is contained in:
parent
bdccffc40e
commit
83f4d86a93
16 changed files with 18 additions and 18 deletions
|
@ -253,7 +253,7 @@ module ActionMailer #:nodoc:
|
|||
class Base
|
||||
include AdvAttrAccessor, PartContainer, Quoting, Utils
|
||||
|
||||
include AbstractController::RenderingController
|
||||
include AbstractController::Rendering
|
||||
include AbstractController::LocalizedCache
|
||||
include AbstractController::Layouts
|
||||
|
||||
|
|
|
@ -15,6 +15,6 @@ module AbstractController
|
|||
autoload :Layouts
|
||||
autoload :LocalizedCache
|
||||
autoload :Logger
|
||||
autoload :RenderingController
|
||||
autoload :Rendering
|
||||
end
|
||||
end
|
||||
|
|
|
@ -4,7 +4,7 @@ module AbstractController
|
|||
module Helpers
|
||||
extend ActiveSupport::Concern
|
||||
|
||||
include RenderingController
|
||||
include Rendering
|
||||
|
||||
def self.next_serial
|
||||
@helper_serial ||= 0
|
||||
|
|
|
@ -2,7 +2,7 @@ module AbstractController
|
|||
module Layouts
|
||||
extend ActiveSupport::Concern
|
||||
|
||||
include RenderingController
|
||||
include Rendering
|
||||
|
||||
included do
|
||||
extlib_inheritable_accessor(:_layout_conditions) { Hash.new }
|
||||
|
|
|
@ -10,7 +10,7 @@ module AbstractController
|
|||
end
|
||||
end
|
||||
|
||||
module RenderingController
|
||||
module Rendering
|
||||
extend ActiveSupport::Concern
|
||||
|
||||
include AbstractController::Logger
|
||||
|
@ -80,7 +80,7 @@ module AbstractController
|
|||
#
|
||||
# :api: plugin
|
||||
def render_to_string(options = {})
|
||||
AbstractController::RenderingController.body_to_s(render_to_body(options))
|
||||
AbstractController::Rendering.body_to_s(render_to_body(options))
|
||||
end
|
||||
|
||||
# Renders the template from an object.
|
|
@ -25,7 +25,7 @@ module ActionController
|
|||
autoload :RackConvenience
|
||||
autoload :Compatibility
|
||||
autoload :Redirector
|
||||
autoload :RenderingController
|
||||
autoload :Rendering
|
||||
autoload :RenderOptions
|
||||
autoload :Rescue
|
||||
autoload :Responder
|
||||
|
|
|
@ -9,7 +9,7 @@ module ActionController
|
|||
include ActionController::HideActions
|
||||
include ActionController::UrlFor
|
||||
include ActionController::Redirector
|
||||
include ActionController::RenderingController
|
||||
include ActionController::Rendering
|
||||
include ActionController::RenderOptions::All
|
||||
include ActionController::Layouts
|
||||
include ActionController::ConditionalGet
|
||||
|
|
|
@ -158,7 +158,7 @@ module ActionController
|
|||
module Layouts
|
||||
extend ActiveSupport::Concern
|
||||
|
||||
include ActionController::RenderingController
|
||||
include ActionController::Rendering
|
||||
include AbstractController::Layouts
|
||||
|
||||
module ClassMethods
|
||||
|
|
|
@ -1,9 +1,9 @@
|
|||
module ActionController
|
||||
module RenderingController
|
||||
module Rendering
|
||||
extend ActiveSupport::Concern
|
||||
|
||||
included do
|
||||
include AbstractController::RenderingController
|
||||
include AbstractController::Rendering
|
||||
include AbstractController::LocalizedCache
|
||||
end
|
||||
|
|
@ -4,7 +4,7 @@ module ActionController #:nodoc:
|
|||
module Streaming
|
||||
extend ActiveSupport::Concern
|
||||
|
||||
include ActionController::RenderingController
|
||||
include ActionController::Rendering
|
||||
|
||||
DEFAULT_SEND_FILE_OPTIONS = {
|
||||
:type => 'application/octet-stream'.freeze,
|
||||
|
|
|
@ -2,7 +2,7 @@ module ActionController #:nodoc:
|
|||
module Verification #:nodoc:
|
||||
extend ActiveSupport::Concern
|
||||
|
||||
include AbstractController::Callbacks, Session, Flash, RenderingController
|
||||
include AbstractController::Callbacks, Session, Flash, Rendering
|
||||
|
||||
# This module provides a class-level method for specifying that certain
|
||||
# actions are guarded against being called without certain prerequisites
|
||||
|
|
|
@ -28,7 +28,7 @@ module AbstractController
|
|||
# Test Render mixin
|
||||
# ====
|
||||
class RenderingController < AbstractController::Base
|
||||
include ::AbstractController::RenderingController
|
||||
include ::AbstractController::Rendering
|
||||
|
||||
def _prefix() end
|
||||
|
||||
|
|
|
@ -6,7 +6,7 @@ module AbstractController
|
|||
module Testing
|
||||
|
||||
class ControllerWithHelpers < AbstractController::Base
|
||||
include AbstractController::RenderingController
|
||||
include AbstractController::Rendering
|
||||
include Helpers
|
||||
|
||||
def with_module
|
||||
|
|
|
@ -6,7 +6,7 @@ module AbstractControllerTests
|
|||
|
||||
# Base controller for these tests
|
||||
class Base < AbstractController::Base
|
||||
include AbstractController::RenderingController
|
||||
include AbstractController::Rendering
|
||||
include AbstractController::Layouts
|
||||
|
||||
self.view_paths = [ActionView::FixtureResolver.new(
|
||||
|
|
|
@ -4,7 +4,7 @@ module AbstractController
|
|||
module Testing
|
||||
|
||||
class CachedController < AbstractController::Base
|
||||
include AbstractController::RenderingController
|
||||
include AbstractController::Rendering
|
||||
include AbstractController::LocalizedCache
|
||||
|
||||
self.view_paths = [ActionView::FixtureResolver.new(
|
||||
|
|
|
@ -4,7 +4,7 @@ module AbstractController
|
|||
module Testing
|
||||
|
||||
class ControllerRenderer < AbstractController::Base
|
||||
include AbstractController::RenderingController
|
||||
include AbstractController::Rendering
|
||||
|
||||
self.view_paths = [ActionView::FixtureResolver.new(
|
||||
"default.erb" => "With Default",
|
||||
|
|
Loading…
Reference in a new issue