Adds Version.fields_for_order_statement.
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@10072 e93f8b46-1217-0410-a6f0-8f06a7374b81
This commit is contained in:
parent
0b31c8ac85
commit
44fcc8919d
|
@ -141,7 +141,7 @@ class Query < ActiveRecord::Base
|
||||||
QueryColumn.new(:assigned_to, :sortable => lambda {User.fields_for_order_statement}, :groupable => true),
|
QueryColumn.new(:assigned_to, :sortable => lambda {User.fields_for_order_statement}, :groupable => true),
|
||||||
QueryColumn.new(:updated_on, :sortable => "#{Issue.table_name}.updated_on", :default_order => 'desc'),
|
QueryColumn.new(:updated_on, :sortable => "#{Issue.table_name}.updated_on", :default_order => 'desc'),
|
||||||
QueryColumn.new(:category, :sortable => "#{IssueCategory.table_name}.name", :groupable => true),
|
QueryColumn.new(:category, :sortable => "#{IssueCategory.table_name}.name", :groupable => true),
|
||||||
QueryColumn.new(:fixed_version, :sortable => ["#{Version.table_name}.effective_date", "#{Version.table_name}.name"], :default_order => 'desc', :groupable => true),
|
QueryColumn.new(:fixed_version, :sortable => lambda {Version.fields_for_order_statement}, :default_order => 'desc', :groupable => true),
|
||||||
QueryColumn.new(:start_date, :sortable => "#{Issue.table_name}.start_date"),
|
QueryColumn.new(:start_date, :sortable => "#{Issue.table_name}.start_date"),
|
||||||
QueryColumn.new(:due_date, :sortable => "#{Issue.table_name}.due_date"),
|
QueryColumn.new(:due_date, :sortable => "#{Issue.table_name}.due_date"),
|
||||||
QueryColumn.new(:estimated_hours, :sortable => "#{Issue.table_name}.estimated_hours"),
|
QueryColumn.new(:estimated_hours, :sortable => "#{Issue.table_name}.estimated_hours"),
|
||||||
|
|
|
@ -184,6 +184,11 @@ class Version < ActiveRecord::Base
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
|
def self.fields_for_order_statement(table=nil)
|
||||||
|
table ||= table_name
|
||||||
|
%w(effective_date name).map {|field| "#{table}.#{field}"}
|
||||||
|
end
|
||||||
|
|
||||||
# Returns the sharings that +user+ can set the version to
|
# Returns the sharings that +user+ can set the version to
|
||||||
def allowed_sharings(user = User.current)
|
def allowed_sharings(user = User.current)
|
||||||
VERSION_SHARINGS.select do |s|
|
VERSION_SHARINGS.select do |s|
|
||||||
|
|
Loading…
Reference in New Issue