Mercurial > hg > soundsoftware-site

comparison app/models/time_entry_query.rb @ 1517:dffacf8a6908 redmine-2.5

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Update to Redmine SVN revision 13367 on 2.5-stable branch
author Chris Cannam
date Tue, 09 Sep 2014 09:29:00 +0100
parents e248c7af89ec
children
comparison
equal deleted inserted replaced
1516:b450a9d58aed 1517:dffacf8a6908
89 end 89 end
90 90
91 def available_columns 91 def available_columns
92 return @available_columns if @available_columns 92 return @available_columns if @available_columns
93 @available_columns = self.class.available_columns.dup 93 @available_columns = self.class.available_columns.dup
94 @available_columns += TimeEntryCustomField.visible.all.map {|cf| QueryCustomFieldColumn.new(cf) } 94 @available_columns += TimeEntryCustomField.visible.
95 @available_columns += IssueCustomField.visible.all.map {|cf| QueryAssociationCustomFieldColumn.new(:issue, cf) } 95 map {|cf| QueryCustomFieldColumn.new(cf) }
96 @available_columns += IssueCustomField.visible.
97 map {|cf| QueryAssociationCustomFieldColumn.new(:issue, cf) }
96 @available_columns 98 @available_columns
97 end 99 end
98 100
99 def default_columns_names 101 def default_columns_names
100 @default_columns_names ||= [:project, :spent_on, :user, :activity, :issue, :comments, :hours] 102 @default_columns_names ||= [:project, :spent_on, :user, :activity, :issue, :comments, :hours]