Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
张重言
rails
提交
d270da56
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,发现更多精彩内容 >>
提交
d270da56
编写于
4月 05, 2010
作者:
S
Santiago Pastorino
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
changed from :object_name to :as on form_for api
上级
1f7b4447
变更
3
隐藏空白更改
内联
并排
Showing
3 changed file
with
15 addition
and
19 deletion
+15
-19
actionpack/lib/action_view/helpers/form_helper.rb
actionpack/lib/action_view/helpers/form_helper.rb
+7
-7
actionpack/test/template/erb/form_for_test.rb
actionpack/test/template/erb/form_for_test.rb
+1
-1
actionpack/test/template/form_helper_test.rb
actionpack/test/template/form_helper_test.rb
+7
-11
未找到文件。
actionpack/lib/action_view/helpers/form_helper.rb
浏览文件 @
d270da56
...
...
@@ -300,16 +300,16 @@ def form_for(record_or_name_or_array, *args, &proc)
case
record_or_name_or_array
when
String
,
Symbol
ActiveSupport
::
Deprecation
.
warn
(
"Us
e the option :object_name => ... instead of a Symbol or String as a the first argument"
,
caller
)
ActiveSupport
::
Deprecation
.
warn
(
"Us
ing form_for(:name, @resource) is deprecated. Please use form_for(@resource, :as => :name) instead."
,
caller
)
unless
args
.
empty?
object_name
=
record_or_name_or_array
when
Array
object
=
record_or_name_or_array
.
last
object_name
=
options
[
:
object_name
]
||
ActionController
::
RecordIdentifier
.
singular_class_name
(
object
)
object_name
=
options
[
:
as
]
||
ActionController
::
RecordIdentifier
.
singular_class_name
(
object
)
apply_form_for_options!
(
record_or_name_or_array
,
options
)
args
.
unshift
object
else
object
=
record_or_name_or_array
object_name
=
options
[
:
object_name
]
||
ActionController
::
RecordIdentifier
.
singular_class_name
(
object
)
object_name
=
options
[
:
as
]
||
ActionController
::
RecordIdentifier
.
singular_class_name
(
object
)
apply_form_for_options!
([
object
],
options
)
args
.
unshift
object
end
...
...
@@ -327,12 +327,12 @@ def apply_form_for_options!(object_or_array, options) #:nodoc:
html_options
=
if
object
.
respond_to?
(
:persisted?
)
&&
object
.
persisted?
{
:class
=>
options
[
:
object_name
]
?
"
#{
options
[
:object_name
]
}
_edit"
:
dom_class
(
object
,
:edit
),
:id
=>
options
[
:
object_name
]
?
"
#{
options
[
:object_name
]
}
_edit"
:
dom_id
(
object
,
:edit
),
{
:class
=>
options
[
:
as
]
?
"
#{
options
[
:as
]
}
_edit"
:
dom_class
(
object
,
:edit
),
:id
=>
options
[
:
as
]
?
"
#{
options
[
:as
]
}
_edit"
:
dom_id
(
object
,
:edit
),
:method
=>
:put
}
else
{
:class
=>
options
[
:
object_name
]
?
"
#{
options
[
:object_name
]
}
_new"
:
dom_class
(
object
,
:new
),
:id
=>
options
[
:
object_name
]
?
"
#{
options
[
:object_name
]
}
_new"
:
dom_id
(
object
),
{
:class
=>
options
[
:
as
]
?
"
#{
options
[
:as
]
}
_new"
:
dom_class
(
object
,
:new
),
:id
=>
options
[
:
as
]
?
"
#{
options
[
:as
]
}
_new"
:
dom_id
(
object
),
:method
=>
:post
}
end
...
...
actionpack/test/template/erb/form_for_test.rb
浏览文件 @
d270da56
...
...
@@ -8,4 +8,4 @@ class TagHelperTest < BlockTestCase
assert_equal
"<form action=
\"
/blah/update
\"
method=
\"
post
\"
></form>"
,
output
end
end
end
\ No newline at end of file
end
actionpack/test/template/form_helper_test.rb
浏览文件 @
d270da56
...
...
@@ -440,7 +440,7 @@ def test_form_for
end
def
test_form_for_with_symbol_object_name
form_for
(
@post
,
:
object_name
=>
"other_name"
,
:html
=>
{
:id
=>
'create-post'
})
do
|
f
|
form_for
(
@post
,
:
as
=>
"other_name"
,
:html
=>
{
:id
=>
'create-post'
})
do
|
f
|
concat
f
.
label
(
:title
)
concat
f
.
text_field
(
:title
)
concat
f
.
text_area
(
:body
)
...
...
@@ -504,12 +504,10 @@ def test_form_for_with_remote
end
def
test_form_for_without_object
assert_deprecated
do
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
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
=
...
...
@@ -603,10 +601,8 @@ def test_submit_with_object_as_existing_record_and_locale_strings
def
test_submit_without_object_and_locale_strings
old_locale
,
I18n
.
locale
=
I18n
.
locale
,
:submit
assert_deprecated
do
form_for
(
:post
)
do
|
f
|
concat
f
.
submit
:class
=>
"extra"
end
form_for
(
:post
)
do
|
f
|
concat
f
.
submit
:class
=>
"extra"
end
expected
=
"<form action='http://www.example.com' method='post'>"
+
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录