Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
张重言
rails
提交
03ac95a1
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,发现更多精彩内容 >>
未验证
提交
03ac95a1
编写于
11月 05, 2017
作者:
E
Eileen M. Uchitelle
提交者:
GitHub
11月 05, 2017
浏览文件
操作
浏览文件
下载
差异文件
Merge pull request #31053 from y-yagi/fix_namespaced_generator
Generate the correct path in nested scaffold generator
上级
68efb013
4dcb630c
变更
3
隐藏空白更改
内联
并排
Showing
3 changed file
with
39 addition
and
10 deletion
+39
-10
railties/lib/rails/generators/named_base.rb
railties/lib/rails/generators/named_base.rb
+9
-9
railties/test/generators/named_base_test.rb
railties/test/generators/named_base_test.rb
+22
-0
railties/test/generators/scaffold_generator_test.rb
railties/test/generators/scaffold_generator_test.rb
+8
-1
未找到文件。
railties/lib/rails/generators/named_base.rb
浏览文件 @
03ac95a1
...
...
@@ -158,26 +158,26 @@ def redirect_resource_name # :doc:
def
model_resource_name
(
prefix:
""
)
# :doc:
resource_name
=
"
#{
prefix
}#{
singular_table_name
}
"
if
controller_class_path
.
empty?
resource_name
else
if
options
[
:model_name
]
"[
#{
controller_class_path
.
map
{
|
name
|
":"
+
name
}
.join("
,
")},
#{
resource_name
}
]"
else
resource_name
end
end
def
singular_route_name
# :doc:
if
controller_class_path
.
empty?
singular_table_name
else
if
options
[
:model_name
]
"
#{
controller_class_path
.
join
(
'_'
)
}
_
#{
singular_table_name
}
"
else
singular_table_name
end
end
def
plural_route_name
# :doc:
if
controller_class_path
.
empty?
plural_table_name
else
if
options
[
:model_name
]
"
#{
controller_class_path
.
join
(
'_'
)
}
_
#{
plural_table_name
}
"
else
plural_table_name
end
end
...
...
railties/test/generators/named_base_test.rb
浏览文件 @
03ac95a1
...
...
@@ -33,6 +33,17 @@ def test_named_generator_attributes
assert_name
g
,
"foos"
,
:plural_name
assert_name
g
,
"admin.foo"
,
:i18n_scope
assert_name
g
,
"admin_foos"
,
:table_name
assert_name
g
,
"admin/foos"
,
:controller_name
assert_name
g
,
%w(admin)
,
:controller_class_path
assert_name
g
,
"Admin::Foos"
,
:controller_class_name
assert_name
g
,
"admin/foos"
,
:controller_file_path
assert_name
g
,
"foos"
,
:controller_file_name
assert_name
g
,
"admin.foos"
,
:controller_i18n_scope
assert_name
g
,
"admin_foo"
,
:singular_route_name
assert_name
g
,
"admin_foos"
,
:plural_route_name
assert_name
g
,
"@admin_foo"
,
:redirect_resource_name
assert_name
g
,
"admin_foo"
,
:model_resource_name
assert_name
g
,
"admin_foos"
,
:index_helper
end
def
test_named_generator_attributes_as_ruby
...
...
@@ -47,6 +58,17 @@ def test_named_generator_attributes_as_ruby
assert_name
g
,
"foos"
,
:plural_name
assert_name
g
,
"admin.foo"
,
:i18n_scope
assert_name
g
,
"admin_foos"
,
:table_name
assert_name
g
,
"Admin::Foos"
,
:controller_name
assert_name
g
,
%w(admin)
,
:controller_class_path
assert_name
g
,
"Admin::Foos"
,
:controller_class_name
assert_name
g
,
"admin/foos"
,
:controller_file_path
assert_name
g
,
"foos"
,
:controller_file_name
assert_name
g
,
"admin.foos"
,
:controller_i18n_scope
assert_name
g
,
"admin_foo"
,
:singular_route_name
assert_name
g
,
"admin_foos"
,
:plural_route_name
assert_name
g
,
"@admin_foo"
,
:redirect_resource_name
assert_name
g
,
"admin_foo"
,
:model_resource_name
assert_name
g
,
"admin_foos"
,
:index_helper
end
def
test_named_generator_attributes_without_pluralized
...
...
railties/test/generators/scaffold_generator_test.rb
浏览文件 @
03ac95a1
...
...
@@ -282,7 +282,14 @@ def test_scaffold_with_namespace_on_invoke
/class Admin::RolesTest < ApplicationSystemTestCase/
# Views
%w(index edit new show _form)
.
each
do
|
view
|
assert_file
"app/views/admin/roles/index.html.erb"
do
|
content
|
assert_match
(
"'Show', admin_role"
,
content
)
assert_match
(
"'Edit', edit_admin_role_path(admin_role)"
,
content
)
assert_match
(
"'Destroy', admin_role"
,
content
)
assert_match
(
"'New Admin Role', new_admin_role_path"
,
content
)
end
%w(edit new show _form)
.
each
do
|
view
|
assert_file
"app/views/admin/roles/
#{
view
}
.html.erb"
end
assert_no_file
"app/views/layouts/admin/roles.html.erb"
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录