Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
张重言
rails
提交
2135daf0
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,体验更适合开发者的 AI 搜索 >>
提交
2135daf0
编写于
6月 20, 2017
作者:
R
Rafael França
提交者:
Rafael Mendonça França
6月 20, 2017
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Merge pull request #29503 from savroff/fix_current_page_engine_issue
Fix current_page? helper issue with engine root path
上级
1c7ad55c
变更
3
隐藏空白更改
内联
并排
Showing
3 changed file
with
23 addition
and
4 deletion
+23
-4
actionview/CHANGELOG.md
actionview/CHANGELOG.md
+6
-0
actionview/lib/action_view/helpers/url_helper.rb
actionview/lib/action_view/helpers/url_helper.rb
+4
-1
actionview/test/template/url_helper_test.rb
actionview/test/template/url_helper_test.rb
+13
-3
未找到文件。
actionview/CHANGELOG.md
浏览文件 @
2135daf0
*
Fix issues with scopes and engine on
`current_page?`
method.
Fixes #29401.
*Nikita Savrov*
*
Generate field ids in
`collection_check_boxes`
and
`collection_radio_buttons`
.
This makes sure that the labels are linked up with the fields.
...
...
actionview/lib/action_view/helpers/url_helper.rb
浏览文件 @
2135daf0
...
...
@@ -552,7 +552,10 @@ def current_page?(options, check_parameters: false)
request_uri
=
url_string
.
index
(
"?"
)
||
check_parameters
?
request
.
fullpath
:
request
.
path
request_uri
=
URI
.
parser
.
unescape
(
request_uri
).
force_encoding
(
Encoding
::
BINARY
)
url_string
.
chomp!
(
"/"
)
if
url_string
.
start_with?
(
"/"
)
&&
url_string
!=
"/"
if
url_string
.
start_with?
(
"/"
)
&&
url_string
!=
"/"
url_string
.
chomp!
(
"/"
)
request_uri
.
chomp!
(
"/"
)
end
if
%r{^
\w
+://}
.
match?
(
url_string
)
url_string
==
"
#{
request
.
protocol
}#{
request
.
host_with_port
}#{
request_uri
}
"
...
...
actionview/test/template/url_helper_test.rb
浏览文件 @
2135daf0
...
...
@@ -16,6 +16,10 @@ class UrlHelperTest < ActiveSupport::TestCase
get
"/other"
=>
"foo#other"
get
"/article/:id"
=>
"foo#article"
,
:as
=>
:article
get
"/category/:category"
=>
"foo#category"
scope
:engine
do
get
"/"
=>
"foo#bar"
end
end
include
ActionView
::
Helpers
::
UrlHelper
...
...
@@ -522,10 +526,10 @@ def test_current_page_with_params_that_match
assert
current_page?
(
"http://www.example.com/?order=desc&page=1"
)
end
def
test_current_page_with_
not_get_verb
@request
=
request_for_url
(
"/e
vents"
,
method: :post
)
def
test_current_page_with_
scope_that_match
@request
=
request_for_url
(
"/e
ngine/"
)
assert
!
current_page?
(
"/events
"
)
assert
current_page?
(
"/engine
"
)
end
def
test_current_page_with_escaped_params
...
...
@@ -554,6 +558,12 @@ def test_current_page_with_trailing_slash
assert
current_page?
(
"/posts/"
)
end
def
test_current_page_with_not_get_verb
@request
=
request_for_url
(
"/events"
,
method: :post
)
assert
!
current_page?
(
"/events"
)
end
def
test_link_unless_current
@request
=
request_for_url
(
"/"
)
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录