Order scopes cleanup.

git-svn-id: http://svn.redmine.org/redmine/trunk@13526 e93f8b46-1217-0410-a6f0-8f06a7374b81

6 files changed, 7 insertions, 7 deletions

diff --git a/app/models/custom_field.rb b/app/models/custom_field.rb
index f3829bf70..0c9ad61f7 100644
--- a/app/models/custom_field.rb
+++ b/app/models/custom_field.rb
@@ -42,7 +42,7 @@ class CustomField < ActiveRecord::Base
     end
   end
 
-  scope :sorted, lambda { order("#{table_name}.position ASC") }
+  scope :sorted, lambda { order(:position) }
   scope :visible, lambda {|*args|
     user = args.shift || User.current
     if user.admin?
diff --git a/app/models/enumeration.rb b/app/models/enumeration.rb
index 9e76211cd..585eb945a 100644
--- a/app/models/enumeration.rb
+++ b/app/models/enumeration.rb
@@ -36,7 +36,7 @@ class Enumeration < ActiveRecord::Base
   validates_length_of :name, :maximum => 30
 
   scope :shared, lambda { where(:project_id => nil) }
-  scope :sorted, lambda { order("#{table_name}.position ASC") }
+  scope :sorted, lambda { order(:position) }
   scope :active, lambda { where(:active => true) }
   scope :system, lambda { where(:project_id => nil) }
   scope :named, lambda {|arg| where("LOWER(#{table_name}.name) = LOWER(?)", arg.to_s.strip)}
diff --git a/app/models/group.rb b/app/models/group.rb
index a7a17edb8..12fa5f84b 100644
--- a/app/models/group.rb
+++ b/app/models/group.rb
@@ -32,7 +32,7 @@ class Group < Principal
 
   before_destroy :remove_references_before_destroy
 
-  scope :sorted, lambda { order("#{table_name}.type, #{table_name}.lastname ASC") }
+  scope :sorted, lambda { order(:type => :asc, :lastname => :desc) }
   scope :named, lambda {|arg| where("LOWER(#{table_name}.lastname) = LOWER(?)", arg.to_s.strip)}
   scope :givable, lambda {where(:type => 'Group')}
 
diff --git a/app/models/issue_status.rb b/app/models/issue_status.rb
index b9fccdb99..76c5ef65b 100644
--- a/app/models/issue_status.rb
+++ b/app/models/issue_status.rb
@@ -30,7 +30,7 @@ class IssueStatus < ActiveRecord::Base
   validates_inclusion_of :default_done_ratio, :in => 0..100, :allow_nil => true
   attr_protected :id
 
-  scope :sorted, lambda { order("#{table_name}.position ASC") }
+  scope :sorted, lambda { order(:position) }
   scope :named, lambda {|arg| where("LOWER(#{table_name}.name) = LOWER(?)", arg.to_s.strip)}
 
   def update_default
diff --git a/app/models/role.rb b/app/models/role.rb
index efd9a334d..31dbf75a1 100644
--- a/app/models/role.rb
+++ b/app/models/role.rb
@@ -39,8 +39,8 @@ class Role < ActiveRecord::Base
     ['own', :label_issues_visibility_own]
   ]
 
-  scope :sorted, lambda { order("#{table_name}.builtin ASC, #{table_name}.position ASC") }
-  scope :givable, lambda { order("#{table_name}.position ASC").where(:builtin => 0) }
+  scope :sorted, lambda { order(:builtin, :position) }
+  scope :givable, lambda { order(:position).where(:builtin => 0) }
   scope :builtin, lambda { |*args|
     compare = (args.first == true ? 'not' : '')
     where("#{compare} builtin = 0")
diff --git a/app/models/tracker.rb b/app/models/tracker.rb
index bf8a08f20..1c867c5f1 100644
--- a/app/models/tracker.rb
+++ b/app/models/tracker.rb
@@ -41,7 +41,7 @@ class Tracker < ActiveRecord::Base
   validates_uniqueness_of :name
   validates_length_of :name, :maximum => 30
 
-  scope :sorted, lambda { order("#{table_name}.position ASC") }
+  scope :sorted, lambda { order(:position) }
   scope :named, lambda {|arg| where("LOWER(#{table_name}.name) = LOWER(?)", arg.to_s.strip)}
 
   def to_s; name end