diff options
| author | hukl <contact@smyck.org> | 2009-09-17 12:10:46 +0200 |
|---|---|---|
| committer | hukl <contact@smyck.org> | 2009-09-17 12:10:46 +0200 |
| commit | cd6ebe068cf42badc07ea0d803476ef4b1be3177 (patch) | |
| tree | b320a22de9a49f58a0cae643a0f5f53f50bb8425 /vendor/plugins/awesome_nested_set/lib | |
| parent | bd408aaae6d7a20fecc7673d807d3c88392cf516 (diff) | |
updated awesome_nested_set
Diffstat (limited to 'vendor/plugins/awesome_nested_set/lib')
| -rw-r--r-- | vendor/plugins/awesome_nested_set/lib/awesome_nested_set.rb | 6 |
1 files changed, 3 insertions, 3 deletions
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: | |||
| 63 | belongs_to :parent, :class_name => self.base_class.class_name, | 63 | belongs_to :parent, :class_name => self.base_class.class_name, |
| 64 | :foreign_key => parent_column_name | 64 | :foreign_key => parent_column_name |
| 65 | has_many :children, :class_name => self.base_class.class_name, | 65 | has_many :children, :class_name => self.base_class.class_name, |
| 66 | :foreign_key => parent_column_name | 66 | :foreign_key => parent_column_name, :order => quoted_left_column_name |
| 67 | 67 | ||
| 68 | attr_accessor :skip_before_destroy | 68 | attr_accessor :skip_before_destroy |
| 69 | 69 | ||
| @@ -160,7 +160,7 @@ module CollectiveIdea #:nodoc: | |||
| 160 | # Don't rebuild a valid tree. | 160 | # Don't rebuild a valid tree. |
| 161 | return true if valid? | 161 | return true if valid? |
| 162 | 162 | ||
| 163 | scope = lambda{} | 163 | scope = lambda{|node|} |
| 164 | if acts_as_nested_set_options[:scope] | 164 | if acts_as_nested_set_options[:scope] |
| 165 | scope = lambda{|node| | 165 | scope = lambda{|node| |
| 166 | scope_column_names.inject(""){|str, column_name| | 166 | scope_column_names.inject(""){|str, column_name| |
| @@ -442,7 +442,7 @@ module CollectiveIdea #:nodoc: | |||
| 442 | end | 442 | end |
| 443 | 443 | ||
| 444 | def store_new_parent | 444 | def store_new_parent |
| 445 | @move_to_new_parent_id = parent_id_changed? ? parent_id : false | 445 | @move_to_new_parent_id = send("#{parent_column_name}_changed?") ? parent_id : false |
| 446 | true # force callback to return true | 446 | true # force callback to return true |
| 447 | end | 447 | end |
| 448 | 448 | ||
