summaryrefslogtreecommitdiffstats
path: root/app/models
diff options
context:
space:
mode:
Diffstat (limited to 'app/models')
-rw-r--r--app/models/query.rb4
1 files changed, 3 insertions, 1 deletions
diff --git a/app/models/query.rb b/app/models/query.rb
index ae162b0a7..1ecf8dcea 100644
--- a/app/models/query.rb
+++ b/app/models/query.rb
@@ -27,10 +27,11 @@ class QueryColumn
self.groupable = name.to_s
end
self.default_order = options[:default_order]
+ @caption_key = options[:caption] || "field_#{name}"
end
def caption
- l("field_#{name}")
+ l(@caption_key)
end
# Returns true if the column is sortable, otherwise false
@@ -120,6 +121,7 @@ class Query < ActiveRecord::Base
@@available_columns = [
QueryColumn.new(:project, :sortable => "#{Project.table_name}.name", :groupable => true),
QueryColumn.new(:tracker, :sortable => "#{Tracker.table_name}.position", :groupable => true),
+ QueryColumn.new(:parent, :sortable => ["#{Issue.table_name}.root_id", "#{Issue.table_name}.lft ASC"], :default_order => 'desc', :caption => :field_parent_issue),
QueryColumn.new(:status, :sortable => "#{IssueStatus.table_name}.position", :groupable => true),
QueryColumn.new(:priority, :sortable => "#{IssuePriority.table_name}.position", :default_order => 'desc', :groupable => true),
QueryColumn.new(:subject, :sortable => "#{Issue.table_name}.subject"),