Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
张重言
rails
提交
925728c2
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,发现更多精彩内容 >>
提交
925728c2
编写于
5月 06, 2013
作者:
R
Rafael Mendonça França
浏览文件
操作
浏览文件
下载
差异文件
Merge pull request #10377 from bricker/template_digest_ending_with_number
Allow numbers in partial name for digesting
上级
b8577bb6
3c516c4b
变更
4
隐藏空白更改
内联
并排
Showing
4 changed file
with
12 addition
and
3 deletion
+12
-3
actionpack/CHANGELOG.md
actionpack/CHANGELOG.md
+3
-1
actionpack/lib/action_view/dependency_tracker.rb
actionpack/lib/action_view/dependency_tracker.rb
+1
-1
actionpack/test/fixtures/digestor/messages/show.html.erb
actionpack/test/fixtures/digestor/messages/show.html.erb
+2
-1
actionpack/test/template/digestor_test.rb
actionpack/test/template/digestor_test.rb
+6
-0
未找到文件。
actionpack/CHANGELOG.md
浏览文件 @
925728c2
*
No changes.
*
Fix an issue where partials with a number in the filename weren't being digested for cache dependencies.
*Bryan Ricker*
Please check
[
4-0-stable
](
https://github.com/rails/rails/blob/4-0-stable/actionpack/CHANGELOG.md
)
for previous changes.
actionpack/lib/action_view/dependency_tracker.rb
浏览文件 @
925728c2
...
...
@@ -39,7 +39,7 @@ class ERBTracker
render\s* # render, followed by optional whitespace
\(? # start an optional parenthesis for the render call
(partial:|:partial\s+=>)?\s* # naming the partial, used with collection -- 1st capture
([@a-z"'][@
a-z_\/\."']+)
# the template name itself -- 2nd capture
([@a-z"'][@
\w\/\."']+)
# the template name itself -- 2nd capture
/x
def
self
.
call
(
name
,
template
)
...
...
actionpack/test/fixtures/digestor/messages/show.html.erb
浏览文件 @
925728c2
...
...
@@ -7,7 +7,8 @@
<%=
render
@message
.
history
.
events
%>
<%# render "something_missing" %>
<%# render "something_missing_1" %>
<%
# Template Dependency: messages/form
%>
\ No newline at end of file
%>
actionpack/test/template/digestor_test.rb
浏览文件 @
925728c2
...
...
@@ -83,6 +83,12 @@ def test_logging_of_missing_template
end
end
def
test_logging_of_missing_template_ending_with_number
assert_logged
"Couldn't find template for digesting: messages/something_missing_1.html"
do
digest
(
"messages/show"
)
end
end
def
test_nested_template_directory
assert_digest_difference
(
"messages/show"
)
do
change_template
(
"messages/actions/_move"
)
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录