diff options
Diffstat (limited to 'app/models')
-rw-r--r-- | app/models/query.rb | 22 | ||||
-rw-r--r-- | app/models/time_entry_query.rb | 1 |
2 files changed, 23 insertions, 0 deletions
diff --git a/app/models/query.rb b/app/models/query.rb index 97a635c10..5094cc3a9 100644 --- a/app/models/query.rb +++ b/app/models/query.rb @@ -85,6 +85,28 @@ class QueryCustomFieldColumn < QueryColumn end end +class QueryAssociationCustomFieldColumn < QueryCustomFieldColumn + + def initialize(association, custom_field) + super(custom_field) + self.name = "#{association}.cf_#{custom_field.id}".to_sym + # TODO: support sorting/grouping by association custom field + self.sortable = false + self.groupable = false + @association = association + end + + def value(object) + if assoc = object.send(@association) + super(assoc) + end + end + + def css_classes + @css_classes ||= "#{@association}_cf_#{@cf.id} #{@cf.field_format}" + end +end + class Query < ActiveRecord::Base class StatementInvalid < ::ActiveRecord::StatementInvalid end diff --git a/app/models/time_entry_query.rb b/app/models/time_entry_query.rb index 9ffa5f15d..7283fbd2f 100644 --- a/app/models/time_entry_query.rb +++ b/app/models/time_entry_query.rb @@ -100,6 +100,7 @@ class TimeEntryQuery < Query return @available_columns if @available_columns @available_columns = self.class.available_columns.dup @available_columns += TimeEntryCustomField.all.map {|cf| QueryCustomFieldColumn.new(cf) } + @available_columns += IssueCustomField.all.map {|cf| QueryAssociationCustomFieldColumn.new(:issue, cf) } @available_columns end |