diff options
| author | Jean-Philippe Lang <jp_lang@yahoo.fr> | 2012-11-23 22:31:02 +0000 |
|---|---|---|
| committer | Jean-Philippe Lang <jp_lang@yahoo.fr> | 2012-11-23 22:31:02 +0000 |
| commit | bb4c530ba29cedef80e56ce79176bcde5ed54e47 (patch) | |
| tree | 50dd969205b5354d97faa278f90b2c75974d18a9 /lib/plugins/awesome_nested_set | |
| parent | e3958ef577eadeb5226fb2cccc790af1341a8f63 (diff) | |
| download | redmine-bb4c530ba29cedef80e56ce79176bcde5ed54e47.tar.gz redmine-bb4c530ba29cedef80e56ce79176bcde5ed54e47.zip | |
Merged r10865 and r10866 from trunk (#12431).
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/2.1-stable@10873 e93f8b46-1217-0410-a6f0-8f06a7374b81
Diffstat (limited to 'lib/plugins/awesome_nested_set')
| -rw-r--r-- | lib/plugins/awesome_nested_set/lib/awesome_nested_set/awesome_nested_set.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/plugins/awesome_nested_set/lib/awesome_nested_set/awesome_nested_set.rb b/lib/plugins/awesome_nested_set/lib/awesome_nested_set/awesome_nested_set.rb index 073e13e29..95d9494d4 100644 --- a/lib/plugins/awesome_nested_set/lib/awesome_nested_set/awesome_nested_set.rb +++ b/lib/plugins/awesome_nested_set/lib/awesome_nested_set/awesome_nested_set.rb @@ -186,7 +186,7 @@ module CollectiveIdea #:nodoc: end # Find root node(s) - root_nodes = where("#{quoted_parent_column_name} IS NULL").order("#{quoted_left_column_name}, #{quoted_right_column_name}, id").each do |root_node| + root_nodes = where("#{quoted_parent_column_name} IS NULL").order(acts_as_nested_set_options[:order]).each do |root_node| # setup index for this scope indices[scope.call(root_node)] ||= 0 set_left_and_rights.call(root_node) |