app/controllers/admin/manager_controller.rb in ab_admin-0.8.3 vs app/controllers/admin/manager_controller.rb in ab_admin-0.9.0

- old
+ new

@@ -93,11 +93,11 @@ def batch_action_list manager.batch_action_list end - def settings - super.merge(manager.custom_settings || {}) + def custom_settings + manager.custom_settings || {} end def export_options manager.export.render_options end