summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJean-Philippe Lang <jp_lang@yahoo.fr>2019-01-19 14:42:56 +0000
committerJean-Philippe Lang <jp_lang@yahoo.fr>2019-01-19 14:42:56 +0000
commit6e54b4414c8149d6bbe47fbe373c4fe2b97153b6 (patch)
tree58ececf0c9e625f67608020c5eea069677f42a56
parent371e9cb4f7cefeb750166e6bebbf251b7855566d (diff)
downloadredmine-6e54b4414c8149d6bbe47fbe373c4fe2b97153b6.tar.gz
redmine-6e54b4414c8149d6bbe47fbe373c4fe2b97153b6.zip
Merged r17823 to 4.0-stable (#30465).
git-svn-id: http://svn.redmine.org/redmine/branches/4.0-stable@17824 e93f8b46-1217-0410-a6f0-8f06a7374b81
-rw-r--r--lib/plugins/acts_as_customizable/lib/acts_as_customizable.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/plugins/acts_as_customizable/lib/acts_as_customizable.rb b/lib/plugins/acts_as_customizable/lib/acts_as_customizable.rb
index 72cc30335..2e36d91be 100644
--- a/lib/plugins/acts_as_customizable/lib/acts_as_customizable.rb
+++ b/lib/plugins/acts_as_customizable/lib/acts_as_customizable.rb
@@ -27,7 +27,7 @@ module Redmine
return if self.included_modules.include?(Redmine::Acts::Customizable::InstanceMethods)
cattr_accessor :customizable_options
self.customizable_options = options
- has_many :custom_values, lambda {includes(:custom_field).order("#{CustomField.table_name}.position")},
+ has_many :custom_values, lambda {includes(:custom_field)},
:as => :customized,
:inverse_of => :customized,
:dependent => :delete_all,