From 36ee95c1f4cc9283478cbfbc2048c9c51a96ce32 Mon Sep 17 00:00:00 2001 From: Jean-Philippe Lang Date: Thu, 30 Oct 2014 08:01:19 +0000 Subject: [PATCH] Removed ORDER option on acts_as_tree that duplicates default_scope. git-svn-id: http://svn.redmine.org/redmine/trunk@13528 e93f8b46-1217-0410-a6f0-8f06a7374b81 --- app/models/enumeration.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/models/enumeration.rb b/app/models/enumeration.rb index 9e547169d..4540e9720 100644 --- a/app/models/enumeration.rb +++ b/app/models/enumeration.rb @@ -24,7 +24,7 @@ class Enumeration < ActiveRecord::Base acts_as_list :scope => 'type = \'#{type}\'' acts_as_customizable - acts_as_tree :order => "#{Enumeration.table_name}.position ASC" + acts_as_tree before_destroy :check_integrity before_save :check_default