From cd6ebe068cf42badc07ea0d803476ef4b1be3177 Mon Sep 17 00:00:00 2001 From: hukl Date: Thu, 17 Sep 2009 12:10:46 +0200 Subject: updated awesome_nested_set --- vendor/plugins/awesome_nested_set/lib/awesome_nested_set.rb | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'vendor/plugins/awesome_nested_set/lib') diff --git a/vendor/plugins/awesome_nested_set/lib/awesome_nested_set.rb b/vendor/plugins/awesome_nested_set/lib/awesome_nested_set.rb index bafdf4c..015aa0f 100644 --- a/vendor/plugins/awesome_nested_set/lib/awesome_nested_set.rb +++ b/vendor/plugins/awesome_nested_set/lib/awesome_nested_set.rb @@ -63,7 +63,7 @@ module CollectiveIdea #:nodoc: belongs_to :parent, :class_name => self.base_class.class_name, :foreign_key => parent_column_name has_many :children, :class_name => self.base_class.class_name, - :foreign_key => parent_column_name + :foreign_key => parent_column_name, :order => quoted_left_column_name attr_accessor :skip_before_destroy @@ -160,7 +160,7 @@ module CollectiveIdea #:nodoc: # Don't rebuild a valid tree. return true if valid? - scope = lambda{} + scope = lambda{|node|} if acts_as_nested_set_options[:scope] scope = lambda{|node| scope_column_names.inject(""){|str, column_name| @@ -442,7 +442,7 @@ module CollectiveIdea #:nodoc: end def store_new_parent - @move_to_new_parent_id = parent_id_changed? ? parent_id : false + @move_to_new_parent_id = send("#{parent_column_name}_changed?") ? parent_id : false true # force callback to return true end -- cgit v1.3