summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--app/models/enumeration.rb2
-rw-r--r--app/models/project.rb2
2 files changed, 2 insertions, 2 deletions
diff --git a/app/models/enumeration.rb b/app/models/enumeration.rb
index 585eb945a..9e547169d 100644
--- a/app/models/enumeration.rb
+++ b/app/models/enumeration.rb
@@ -18,7 +18,7 @@
class Enumeration < ActiveRecord::Base
include Redmine::SubclassFactory
- default_scope lambda {order("#{Enumeration.table_name}.position ASC")}
+ default_scope lambda {order(:position)}
belongs_to :project
diff --git a/app/models/project.rb b/app/models/project.rb
index 19108b2a3..f29f50f21 100644
--- a/app/models/project.rb
+++ b/app/models/project.rb
@@ -37,7 +37,7 @@ class Project < ActiveRecord::Base
where("#{Principal.table_name}.status=#{Principal::STATUS_ACTIVE}")},
:class_name => 'Member'
has_many :enabled_modules, :dependent => :delete_all
- has_and_belongs_to_many :trackers, lambda {order("#{Tracker.table_name}.position")}
+ has_and_belongs_to_many :trackers, lambda {order(:position)}
has_many :issues, :dependent => :destroy
has_many :issue_changes, :through => :issues, :source => :journals
has_many :versions, lambda {order("#{Version.table_name}.effective_date DESC, #{Version.table_name}.name DESC")}, :dependent => :destroy