jro_apps/redmine Commit - r12406:89c43d24c82f

back out r12680...

Toshi MARUYAMA -

r12406:89c43d24c82f

parent child

Context file:

r12406:89c43d24c82f

app/models/project.rb +1 -1

                                       :join_table => "#{table_name_prefix}custom_fields_projects#{table_name_suffix}",
                                       :association_foreign_key => 'custom_field_id'
-              acts_as_nested_set :order_column => 'name', :dependent => :destroy
+              acts_as_nested_set :order => 'name', :dependent => :destroy
               acts_as_attachable :view_permission => :view_files,
                                  :delete_permission => :manage_files

lib/plugins/awesome_nested_set/lib/awesome_nested_set/awesome_nested_set.rb +5 -4

                           # set left
                           node[left_column_name] = indices[scope.call(node)] += 1
                           # find
-                          where(["#{quoted_parent_column_full_name} = ? #{scope.call(node)}", node]).order("#{quoted_left_column_full_name}, #{quoted_right_column_full_name}, id").each{|n| set_left_and_rights.call(n) }
+                          where(["#{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!(:validate => validate_nodes)
                         end
                         # Find root node(s)
-                        root_nodes = where("#{quoted_parent_column_full_name} IS NULL").
+                        root_nodes = where("#{quoted_parent_column_name} IS NULL").
-                            order(acts_as_nested_set_options[:order_column]).
+                          order(acts_as_nested_set_options[:order]).each do |root_node|
-                            each do |root_node|
                           # setup index for this scope
                           indices[scope.call(root_node)] ||= 0
                           set_left_and_rights.call(root_node)

General Comments 0

You need to be logged in to leave comments. Login now

No TODOs yet

	Repositories
g s	Goto summary page
g c	Goto changelog page
g f	Goto files page
g F	Goto files page with file search activated
g p	Goto pull requests page
g o	Goto repository settings
g O	Goto repository access permissions settings
t s	Toggle sidebar on some pages