Browse Source

Fixed SQL errors with SQLServer (column specified more than once in the order by list) after r13526.

git-svn-id: http://svn.redmine.org/redmine/trunk@13527 e93f8b46-1217-0410-a6f0-8f06a7374b81
tags/3.0.0
Jean-Philippe Lang 9 years ago
parent
commit
3ea84bd7e4
2 changed files with 2 additions and 2 deletions
  1. 1
    1
      app/models/enumeration.rb
  2. 1
    1
      app/models/project.rb

+ 1
- 1
app/models/enumeration.rb View File

@@ -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


+ 1
- 1
app/models/project.rb View File

@@ -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

Loading…
Cancel
Save