Commit 8a6d6f8c by dongxiaowei

fix: some controller do not call defaults

parent 3eb5545e
...@@ -144,7 +144,7 @@ class SimpleController::BaseController < ::InheritedResources::Base ...@@ -144,7 +144,7 @@ class SimpleController::BaseController < ::InheritedResources::Base
@policy_class = options.delete(:policy_class) || name.sub(/Controller$/, 'Policy').safe_constantize @policy_class = options.delete(:policy_class) || name.sub(/Controller$/, 'Policy').safe_constantize
@database_policy = name.sub(/Controller$/, 'DatabasePolicy') @database_policy = name.sub(/Controller$/, 'DatabasePolicy')
@zh_name = options.delete(:zh_name) @zh_name = options.delete(:zh_name)
@zh_actions = options.delete(:zh_actions).presence || {} @zh_actions = options.delete(:zh_actions) || {}
_importable_class = options.delete(:importable_class) _importable_class = options.delete(:importable_class)
_exportable_class = options.delete(:exportable_class) _exportable_class = options.delete(:exportable_class)
...@@ -191,7 +191,7 @@ class SimpleController::BaseController < ::InheritedResources::Base ...@@ -191,7 +191,7 @@ class SimpleController::BaseController < ::InheritedResources::Base
def zh_actions def zh_actions
default_actions = { index: '列表', show: '查看', update: '编辑', create: '新增', destroy: '删除', export: '导出', import: '导入' }.with_indifferent_access default_actions = { index: '列表', show: '查看', update: '编辑', create: '新增', destroy: '删除', export: '导出', import: '导入' }.with_indifferent_access
default_actions.merge(@zh_actions) default_actions.merge(@zh_actions || {})
end end
end end
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment