Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
张重言
rails
提交
e3744166
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,发现更多精彩内容 >>
提交
e3744166
编写于
9月 03, 2009
作者:
Y
Yehuda Katz + Carl Lerche
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Refactor ActionController to use find_template and template_exists?
上级
4b6321ef
变更
5
隐藏空白更改
内联
并排
Showing
5 changed file
with
14 addition
and
10 deletion
+14
-10
actionpack/lib/abstract_controller/layouts.rb
actionpack/lib/abstract_controller/layouts.rb
+5
-5
actionpack/lib/abstract_controller/rendering_controller.rb
actionpack/lib/abstract_controller/rendering_controller.rb
+5
-1
actionpack/lib/action_controller/base.rb
actionpack/lib/action_controller/base.rb
+1
-1
actionpack/lib/action_controller/legacy/layout.rb
actionpack/lib/action_controller/legacy/layout.rb
+1
-1
actionpack/test/abstract_controller/abstract_controller_test.rb
...pack/test/abstract_controller/abstract_controller_test.rb
+2
-2
未找到文件。
actionpack/lib/abstract_controller/layouts.rb
浏览文件 @
e3744166
...
...
@@ -119,17 +119,17 @@ def _layout(details)
when
true
raise
ArgumentError
,
"Layouts must be specified as a String, Symbol, false, or nil"
when
nil
self
.
class_eval
<<-
ruby_eval
,
__FILE__
,
__LINE__
+
1
self
.
class_eval
<<-
RUBY
,
__FILE__
,
__LINE__
+
1
def _layout(details)
self.class.cache_layout(details) do
if
view_paths.exists?("
#{
_implied_layout_name
}
", details,
"layouts")
if
template_exists?("
#{
_implied_layout_name
}
", details, :_prefix =>
"layouts")
"
#{
_implied_layout_name
}
"
else
super
end
end
end
ruby_eval
RUBY
end
self
.
class_eval
{
private
:_layout
}
end
...
...
@@ -167,7 +167,7 @@ def _layout(details) end
# details<Hash{Symbol => Object}>:: A list of details to restrict
# the lookup to. By default, layout lookup is limited to the
# formats specified for the current request.
def
_layout_for_name
(
name
,
details
=
{
:formats
=>
formats
}
)
def
_layout_for_name
(
name
,
details
)
name
&&
_find_layout
(
name
,
details
)
end
...
...
@@ -183,7 +183,7 @@ def _layout_for_name(name, details = {:formats => formats})
def
_find_layout
(
name
,
details
)
# TODO: Make prefix actually part of details in ViewPath#find_by_parts
prefix
=
details
.
key?
(
:prefix
)
?
details
.
delete
(
:prefix
)
:
"layouts"
view_paths
.
find
(
name
,
details
,
prefix
)
find_template
(
name
,
details
,
:_prefix
=>
prefix
)
end
# Returns the default layout for this controller and a given set of details.
...
...
actionpack/lib/abstract_controller/rendering_controller.rb
浏览文件 @
e3744166
...
...
@@ -119,7 +119,11 @@ def _determine_template(options)
def
find_template
(
name
,
details
,
options
)
view_paths
.
find
(
name
,
details
,
options
[
:_prefix
],
options
[
:_partial
])
end
def
template_exists?
(
name
,
details
,
options
)
view_paths
.
exists?
(
name
,
details
,
options
[
:_prefix
],
options
[
:_partial
])
end
def
with_template_cache
(
name
)
yield
end
...
...
actionpack/lib/action_controller/base.rb
浏览文件 @
e3744166
...
...
@@ -51,7 +51,7 @@ def default_render
def
method_for_action
(
action_name
)
super
||
begin
if
view_paths
.
exists?
(
action_name
.
to_s
,
{
:formats
=>
formats
,
:locales
=>
[
I18n
.
locale
]},
controller_path
)
if
template_exists?
(
action_name
.
to_s
,
{
:formats
=>
formats
},
:_prefix
=>
controller_path
)
"default_render"
end
end
...
...
actionpack/lib/action_controller/legacy/layout.rb
浏览文件 @
e3744166
...
...
@@ -191,7 +191,7 @@ def default_layout(*args)
def
memoized_find_layout
(
layout
,
formats
)
#:nodoc:
return
layout
if
layout
.
nil?
||
layout
.
respond_to?
(
:render
)
prefix
=
layout
.
to_s
=~
/layouts\//
?
nil
:
"layouts"
view_paths
.
find
(
layout
.
to_s
,
{
:formats
=>
formats
},
prefix
)
find_template
(
layout
.
to_s
,
{
:formats
=>
formats
},
:_prefix
=>
prefix
)
end
def
find_layout
(
*
args
)
...
...
actionpack/test/abstract_controller/abstract_controller_test.rb
浏览文件 @
e3744166
...
...
@@ -148,10 +148,10 @@ class WithLayouts < PrefixedViews
private
def
self
.
layout
(
formats
)
begin
view_paths
.
find
(
name
.
underscore
,
{
:formats
=>
formats
},
"layouts"
)
find_template
(
name
.
underscore
,
{
:formats
=>
formats
},
:_prefix
=>
"layouts"
)
rescue
ActionView
::
MissingTemplate
begin
view_paths
.
find
(
"application"
,
{
:formats
=>
formats
},
"layouts"
)
find_template
(
"application"
,
{
:formats
=>
formats
},
:_prefix
=>
"layouts"
)
rescue
ActionView
::
MissingTemplate
end
end
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录