modifications on awesome_nested_set according to this post:…

modifications on awesome_nested_set according to this post: https://www.chiliproject.org/boards/2/topics/314

modifications on awesome_nested_set according to this post:…
modifications on awesome_nested_set according to this post: https://www.chiliproject.org/boards/2/topics/314
185e9e33 · Enrique García Cota · 86751132 · 185e9e33
Commit 185e9e33 authored May 14, 2012 by Enrique García Cota
Show whitespace changes
Inline Side-by-side

Showing with 62 additions and 62 deletions

awesome_nested_set.rb vendor/plugins/awesome_nested_set/lib/awesome_nested_set.rb +62 -62

No files found.
--- a/vendor/plugins/awesome_nested_set/lib/awesome_nested_set.rb
+++ b/vendor/plugins/awesome_nested_set/lib/awesome_nested_set.rb
@@ -165,7 +165,7 @@ module CollectiveIdea #:nodoc:
        # Rebuilds the left & rights if unset or invalid.  Also very useful for converting from acts_as_tree.
        def rebuild!
          # Don't rebuild a valid tree.
-          return true if valid?
+          # return true if valid?
          scope = lambda{|node|}
          if acts_as_nested_set_options[:scope]
@@ -181,7 +181,7 @@ module CollectiveIdea #:nodoc:
            # set left
            node[left_column_name] = indices[scope.call(node)] += 1
            # find
-            find(:all, :conditions => ["#{quoted_parent_column_name} = ? #{scope.call(node)}", node], :order => "#{quoted_left_column_name}, #{quoted_right_column_name}, #{acts_as_nested_set_options[:order]}").each{|n| set_left_and_rights.call(n) }
+            find(:all, :conditions => ["#{quoted_parent_column_name} = ? #{scope.call(node)}", node], :order => "#{acts_as_nested_set_options[:order]}").each{|n| set_left_and_rights.call(n) }
            # set right
            node[right_column_name] = indices[scope.call(node)] += 1
            node.save!