From baf1496fb3d65e60b8eddad0116940d1f6b09087 Mon Sep 17 00:00:00 2001 From: Andrea Dal Ponte Date: Thu, 5 Jun 2014 23:27:19 +0200 Subject: [PATCH] Indentation --- lib/rails_admin_nestable/configuration.rb | 35 +++++++++++------------ 1 file changed, 17 insertions(+), 18 deletions(-) diff --git a/lib/rails_admin_nestable/configuration.rb b/lib/rails_admin_nestable/configuration.rb index 7e4d951..87156a9 100755 --- a/lib/rails_admin_nestable/configuration.rb +++ b/lib/rails_admin_nestable/configuration.rb @@ -17,31 +17,30 @@ def list? end def options - if tree? - @nestable_options ||= self.tree_options - elsif list? - @nestable_options ||= self.list_options + @nestable_options ||= begin + options = self.tree_options if tree? + options = self.list_options if list? + options || {} end - - @nestable_options || {} end protected - def tree_options - tree.class == Hash ? TREE_DEFAULT_OPTIONS.merge(tree) : TREE_DEFAULT_OPTIONS - end - def list_options - LIST_DEFAULT_OPTIONS.merge(list.class == Hash ? list : {}) - end + def tree_options + tree.class == Hash ? TREE_DEFAULT_OPTIONS.merge(tree) : TREE_DEFAULT_OPTIONS + end - def tree - @nestable_tree ||= ::RailsAdmin::Config.model(@abstract_model.model).nestable_tree - end + def list_options + LIST_DEFAULT_OPTIONS.merge(list.class == Hash ? list : {}) + end - def list - @nestable_list ||= ::RailsAdmin::Config.model(@abstract_model.model).nestable_list - end + def tree + @nestable_tree ||= ::RailsAdmin::Config.model(@abstract_model.model).nestable_tree + end + + def list + @nestable_list ||= ::RailsAdmin::Config.model(@abstract_model.model).nestable_list + end end end