Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
张重言
rails
提交
be797750
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,发现更多精彩内容 >>
提交
be797750
编写于
11月 18, 2010
作者:
L
Leonardo Capillera
提交者:
Santiago Pastorino
11月 18, 2010
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Remove deprecated form_for with strings or symbols
Signed-off-by:
N
Santiago Pastorino
<
santiago@wyeworks.com
>
上级
c52e2cf4
变更
4
隐藏空白更改
内联
并排
Showing
4 changed file
with
8 addition
and
44 deletion
+8
-44
actionpack/lib/action_view/helpers/form_helper.rb
actionpack/lib/action_view/helpers/form_helper.rb
+3
-9
actionpack/test/template/erb/form_for_test.rb
actionpack/test/template/erb/form_for_test.rb
+2
-1
actionpack/test/template/erb/helper.rb
actionpack/test/template/erb/helper.rb
+3
-1
actionpack/test/template/form_helper_test.rb
actionpack/test/template/form_helper_test.rb
+0
-33
未找到文件。
actionpack/lib/action_view/helpers/form_helper.rb
浏览文件 @
be797750
...
...
@@ -303,15 +303,9 @@ def form_for(record, options = {}, &proc)
options
[
:html
]
||=
{}
case
record
when
String
,
Symbol
object_name
=
record
object
=
nil
else
object
=
record
.
is_a?
(
Array
)
?
record
.
last
:
record
object_name
=
options
[
:as
]
||
ActiveModel
::
Naming
.
param_key
(
object
)
apply_form_for_options!
(
record
,
options
)
end
object
=
record
.
is_a?
(
Array
)
?
record
.
last
:
record
object_name
=
options
[
:as
]
||
ActiveModel
::
Naming
.
param_key
(
object
)
apply_form_for_options!
(
record
,
options
)
options
[
:html
][
:remote
]
=
options
.
delete
(
:remote
)
builder
=
options
[
:parent_builder
]
=
instantiate_builder
(
object_name
,
object
,
options
,
&
proc
)
...
...
actionpack/test/template/erb/form_for_test.rb
浏览文件 @
be797750
require
"abstract_unit"
require
"template/erb/helper"
require
"controller/fake_models"
module
ERBTest
class
TagHelperTest
<
BlockTestCase
test
"form_for works"
do
output
=
render_content
"form_for(
:staticpage
, :url => {:controller => 'blah', :action => 'update'})"
,
""
output
=
render_content
"form_for(
Post.new
, :url => {:controller => 'blah', :action => 'update'})"
,
""
assert_match
%r{<form.*action="/blah/update".*method="post">.*</form>}
,
output
end
end
...
...
actionpack/test/template/erb/helper.rb
浏览文件 @
be797750
...
...
@@ -4,6 +4,8 @@ class ViewContext
include
ActionView
::
Helpers
::
TagHelper
include
ActionView
::
Helpers
::
JavaScriptHelper
include
ActionView
::
Helpers
::
FormHelper
include
ActionView
::
Context
include
ActionController
::
RecordIdentifier
attr_accessor
:output_buffer
,
:controller
...
...
@@ -20,4 +22,4 @@ def block_helper(str, rest)
"<%=
#{
str
}
do %>
#{
rest
}
<% end %>"
end
end
end
\ No newline at end of file
end
actionpack/test/template/form_helper_test.rb
浏览文件 @
be797750
...
...
@@ -781,23 +781,6 @@ def test_form_for_with_remote_without_html
assert_dom_equal
expected
,
output_buffer
end
def
test_form_for_without_object
form_for
(
:post
,
:html
=>
{
:id
=>
'create-post'
})
do
|
f
|
concat
f
.
text_field
(
:title
)
concat
f
.
text_area
(
:body
)
concat
f
.
check_box
(
:secret
)
end
expected
=
whole_form
(
"/"
,
"create-post"
)
do
"<input name='post[title]' size='30' type='text' id='post_title' value='Hello World' />"
+
"<textarea name='post[body]' id='post_body' rows='20' cols='40'>Back to the hill and over it again!</textarea>"
+
"<input name='post[secret]' type='hidden' value='0' />"
+
"<input name='post[secret]' checked='checked' type='checkbox' id='post_secret' value='1' />"
end
assert_dom_equal
expected
,
output_buffer
end
def
test_form_for_with_index
form_for
(
@post
,
:as
=>
"post[]"
)
do
|
f
|
concat
f
.
label
(
:title
)
...
...
@@ -867,22 +850,6 @@ def test_submit_with_object_as_existing_record_and_locale_strings
I18n
.
locale
=
old_locale
end
def
test_submit_without_object_and_locale_strings
old_locale
,
I18n
.
locale
=
I18n
.
locale
,
:submit
form_for
(
:post
)
do
|
f
|
concat
f
.
submit
:class
=>
"extra"
end
expected
=
whole_form
do
"<input name='commit' class='extra' id='post_submit' type='submit' value='Save changes' />"
end
assert_dom_equal
expected
,
output_buffer
ensure
I18n
.
locale
=
old_locale
end
def
test_submit_with_object_and_nested_lookup
old_locale
,
I18n
.
locale
=
I18n
.
locale
,
:submit
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录