Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
张重言
rails
提交
83f4d86a
R
rails
项目概览
张重言
/
rails
通知
1
Star
0
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
R
rails
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
提交
83f4d86a
编写于
12月 20, 2009
作者:
D
David Heinemeier Hansson
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Rename the RenderingController module to just plain Rendering
上级
bdccffc4
变更
16
显示空白变更内容
内联
并排
Showing
16 changed file
with
18 addition
and
18 deletion
+18
-18
actionmailer/lib/action_mailer/base.rb
actionmailer/lib/action_mailer/base.rb
+1
-1
actionpack/lib/abstract_controller.rb
actionpack/lib/abstract_controller.rb
+1
-1
actionpack/lib/abstract_controller/helpers.rb
actionpack/lib/abstract_controller/helpers.rb
+1
-1
actionpack/lib/abstract_controller/layouts.rb
actionpack/lib/abstract_controller/layouts.rb
+1
-1
actionpack/lib/abstract_controller/rendering.rb
actionpack/lib/abstract_controller/rendering.rb
+2
-2
actionpack/lib/action_controller.rb
actionpack/lib/action_controller.rb
+1
-1
actionpack/lib/action_controller/base.rb
actionpack/lib/action_controller/base.rb
+1
-1
actionpack/lib/action_controller/metal/layouts.rb
actionpack/lib/action_controller/metal/layouts.rb
+1
-1
actionpack/lib/action_controller/metal/rendering.rb
actionpack/lib/action_controller/metal/rendering.rb
+2
-2
actionpack/lib/action_controller/metal/streaming.rb
actionpack/lib/action_controller/metal/streaming.rb
+1
-1
actionpack/lib/action_controller/metal/verification.rb
actionpack/lib/action_controller/metal/verification.rb
+1
-1
actionpack/test/abstract/abstract_controller_test.rb
actionpack/test/abstract/abstract_controller_test.rb
+1
-1
actionpack/test/abstract/helper_test.rb
actionpack/test/abstract/helper_test.rb
+1
-1
actionpack/test/abstract/layouts_test.rb
actionpack/test/abstract/layouts_test.rb
+1
-1
actionpack/test/abstract/localized_cache_test.rb
actionpack/test/abstract/localized_cache_test.rb
+1
-1
actionpack/test/abstract/render_test.rb
actionpack/test/abstract/render_test.rb
+1
-1
未找到文件。
actionmailer/lib/action_mailer/base.rb
浏览文件 @
83f4d86a
...
@@ -253,7 +253,7 @@ module ActionMailer #:nodoc:
...
@@ -253,7 +253,7 @@ module ActionMailer #:nodoc:
class
Base
class
Base
include
AdvAttrAccessor
,
PartContainer
,
Quoting
,
Utils
include
AdvAttrAccessor
,
PartContainer
,
Quoting
,
Utils
include
AbstractController
::
Rendering
Controller
include
AbstractController
::
Rendering
include
AbstractController
::
LocalizedCache
include
AbstractController
::
LocalizedCache
include
AbstractController
::
Layouts
include
AbstractController
::
Layouts
...
...
actionpack/lib/abstract_controller.rb
浏览文件 @
83f4d86a
...
@@ -15,6 +15,6 @@ module AbstractController
...
@@ -15,6 +15,6 @@ module AbstractController
autoload
:Layouts
autoload
:Layouts
autoload
:LocalizedCache
autoload
:LocalizedCache
autoload
:Logger
autoload
:Logger
autoload
:Rendering
Controller
autoload
:Rendering
end
end
end
end
actionpack/lib/abstract_controller/helpers.rb
浏览文件 @
83f4d86a
...
@@ -4,7 +4,7 @@ module AbstractController
...
@@ -4,7 +4,7 @@ module AbstractController
module
Helpers
module
Helpers
extend
ActiveSupport
::
Concern
extend
ActiveSupport
::
Concern
include
Rendering
Controller
include
Rendering
def
self
.
next_serial
def
self
.
next_serial
@helper_serial
||=
0
@helper_serial
||=
0
...
...
actionpack/lib/abstract_controller/layouts.rb
浏览文件 @
83f4d86a
...
@@ -2,7 +2,7 @@ module AbstractController
...
@@ -2,7 +2,7 @@ module AbstractController
module
Layouts
module
Layouts
extend
ActiveSupport
::
Concern
extend
ActiveSupport
::
Concern
include
Rendering
Controller
include
Rendering
included
do
included
do
extlib_inheritable_accessor
(
:_layout_conditions
)
{
Hash
.
new
}
extlib_inheritable_accessor
(
:_layout_conditions
)
{
Hash
.
new
}
...
...
actionpack/lib/abstract_controller/rendering
_controller
.rb
→
actionpack/lib/abstract_controller/rendering.rb
浏览文件 @
83f4d86a
...
@@ -10,7 +10,7 @@ def initialize(message = nil)
...
@@ -10,7 +10,7 @@ def initialize(message = nil)
end
end
end
end
module
Rendering
Controller
module
Rendering
extend
ActiveSupport
::
Concern
extend
ActiveSupport
::
Concern
include
AbstractController
::
Logger
include
AbstractController
::
Logger
...
@@ -80,7 +80,7 @@ def render_to_body(options = {})
...
@@ -80,7 +80,7 @@ def render_to_body(options = {})
#
#
# :api: plugin
# :api: plugin
def
render_to_string
(
options
=
{})
def
render_to_string
(
options
=
{})
AbstractController
::
Rendering
Controller
.
body_to_s
(
render_to_body
(
options
))
AbstractController
::
Rendering
.
body_to_s
(
render_to_body
(
options
))
end
end
# Renders the template from an object.
# Renders the template from an object.
...
...
actionpack/lib/action_controller.rb
浏览文件 @
83f4d86a
...
@@ -25,7 +25,7 @@ module ActionController
...
@@ -25,7 +25,7 @@ module ActionController
autoload
:RackConvenience
autoload
:RackConvenience
autoload
:Compatibility
autoload
:Compatibility
autoload
:Redirector
autoload
:Redirector
autoload
:Rendering
Controller
autoload
:Rendering
autoload
:RenderOptions
autoload
:RenderOptions
autoload
:Rescue
autoload
:Rescue
autoload
:Responder
autoload
:Responder
...
...
actionpack/lib/action_controller/base.rb
浏览文件 @
83f4d86a
...
@@ -9,7 +9,7 @@ class Base < Metal
...
@@ -9,7 +9,7 @@ class Base < Metal
include
ActionController
::
HideActions
include
ActionController
::
HideActions
include
ActionController
::
UrlFor
include
ActionController
::
UrlFor
include
ActionController
::
Redirector
include
ActionController
::
Redirector
include
ActionController
::
Rendering
Controller
include
ActionController
::
Rendering
include
ActionController
::
RenderOptions
::
All
include
ActionController
::
RenderOptions
::
All
include
ActionController
::
Layouts
include
ActionController
::
Layouts
include
ActionController
::
ConditionalGet
include
ActionController
::
ConditionalGet
...
...
actionpack/lib/action_controller/metal/layouts.rb
浏览文件 @
83f4d86a
...
@@ -158,7 +158,7 @@ module ActionController
...
@@ -158,7 +158,7 @@ module ActionController
module
Layouts
module
Layouts
extend
ActiveSupport
::
Concern
extend
ActiveSupport
::
Concern
include
ActionController
::
Rendering
Controller
include
ActionController
::
Rendering
include
AbstractController
::
Layouts
include
AbstractController
::
Layouts
module
ClassMethods
module
ClassMethods
...
...
actionpack/lib/action_controller/metal/rendering
_controller
.rb
→
actionpack/lib/action_controller/metal/rendering.rb
浏览文件 @
83f4d86a
module
ActionController
module
ActionController
module
Rendering
Controller
module
Rendering
extend
ActiveSupport
::
Concern
extend
ActiveSupport
::
Concern
included
do
included
do
include
AbstractController
::
Rendering
Controller
include
AbstractController
::
Rendering
include
AbstractController
::
LocalizedCache
include
AbstractController
::
LocalizedCache
end
end
...
...
actionpack/lib/action_controller/metal/streaming.rb
浏览文件 @
83f4d86a
...
@@ -4,7 +4,7 @@ module ActionController #:nodoc:
...
@@ -4,7 +4,7 @@ module ActionController #:nodoc:
module
Streaming
module
Streaming
extend
ActiveSupport
::
Concern
extend
ActiveSupport
::
Concern
include
ActionController
::
Rendering
Controller
include
ActionController
::
Rendering
DEFAULT_SEND_FILE_OPTIONS
=
{
DEFAULT_SEND_FILE_OPTIONS
=
{
:type
=>
'application/octet-stream'
.
freeze
,
:type
=>
'application/octet-stream'
.
freeze
,
...
...
actionpack/lib/action_controller/metal/verification.rb
浏览文件 @
83f4d86a
...
@@ -2,7 +2,7 @@ module ActionController #:nodoc:
...
@@ -2,7 +2,7 @@ module ActionController #:nodoc:
module
Verification
#:nodoc:
module
Verification
#:nodoc:
extend
ActiveSupport
::
Concern
extend
ActiveSupport
::
Concern
include
AbstractController
::
Callbacks
,
Session
,
Flash
,
Rendering
Controller
include
AbstractController
::
Callbacks
,
Session
,
Flash
,
Rendering
# This module provides a class-level method for specifying that certain
# This module provides a class-level method for specifying that certain
# actions are guarded against being called without certain prerequisites
# actions are guarded against being called without certain prerequisites
...
...
actionpack/test/abstract/abstract_controller_test.rb
浏览文件 @
83f4d86a
...
@@ -28,7 +28,7 @@ class TestBasic < ActiveSupport::TestCase
...
@@ -28,7 +28,7 @@ class TestBasic < ActiveSupport::TestCase
# Test Render mixin
# Test Render mixin
# ====
# ====
class
RenderingController
<
AbstractController
::
Base
class
RenderingController
<
AbstractController
::
Base
include
::
AbstractController
::
Rendering
Controller
include
::
AbstractController
::
Rendering
def
_prefix
()
end
def
_prefix
()
end
...
...
actionpack/test/abstract/helper_test.rb
浏览文件 @
83f4d86a
...
@@ -6,7 +6,7 @@ module AbstractController
...
@@ -6,7 +6,7 @@ module AbstractController
module
Testing
module
Testing
class
ControllerWithHelpers
<
AbstractController
::
Base
class
ControllerWithHelpers
<
AbstractController
::
Base
include
AbstractController
::
Rendering
Controller
include
AbstractController
::
Rendering
include
Helpers
include
Helpers
def
with_module
def
with_module
...
...
actionpack/test/abstract/layouts_test.rb
浏览文件 @
83f4d86a
...
@@ -6,7 +6,7 @@ module Layouts
...
@@ -6,7 +6,7 @@ module Layouts
# Base controller for these tests
# Base controller for these tests
class
Base
<
AbstractController
::
Base
class
Base
<
AbstractController
::
Base
include
AbstractController
::
Rendering
Controller
include
AbstractController
::
Rendering
include
AbstractController
::
Layouts
include
AbstractController
::
Layouts
self
.
view_paths
=
[
ActionView
::
FixtureResolver
.
new
(
self
.
view_paths
=
[
ActionView
::
FixtureResolver
.
new
(
...
...
actionpack/test/abstract/localized_cache_test.rb
浏览文件 @
83f4d86a
...
@@ -4,7 +4,7 @@ module AbstractController
...
@@ -4,7 +4,7 @@ module AbstractController
module
Testing
module
Testing
class
CachedController
<
AbstractController
::
Base
class
CachedController
<
AbstractController
::
Base
include
AbstractController
::
Rendering
Controller
include
AbstractController
::
Rendering
include
AbstractController
::
LocalizedCache
include
AbstractController
::
LocalizedCache
self
.
view_paths
=
[
ActionView
::
FixtureResolver
.
new
(
self
.
view_paths
=
[
ActionView
::
FixtureResolver
.
new
(
...
...
actionpack/test/abstract/render_test.rb
浏览文件 @
83f4d86a
...
@@ -4,7 +4,7 @@ module AbstractController
...
@@ -4,7 +4,7 @@ module AbstractController
module
Testing
module
Testing
class
ControllerRenderer
<
AbstractController
::
Base
class
ControllerRenderer
<
AbstractController
::
Base
include
AbstractController
::
Rendering
Controller
include
AbstractController
::
Rendering
self
.
view_paths
=
[
ActionView
::
FixtureResolver
.
new
(
self
.
view_paths
=
[
ActionView
::
FixtureResolver
.
new
(
"default.erb"
=>
"With Default"
,
"default.erb"
=>
"With Default"
,
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录