| @@ -129,23 +129,12 module Redmine | |||
|
|
129 | 129 | |
|
|
130 | 130 | # Add list and boolean custom fields as available criteria |
|
|
131 | 131 | custom_fields = (@project.nil? ? IssueCustomField.for_all : @project.all_issue_custom_fields) |
|
|
132 | custom_fields.select {|cf| %w(list bool).include? cf.field_format }.each do |cf| | |
|
|
133 | @available_criteria["cf_#{cf.id}"] = {:sql => "#{cf.join_alias}.value", | |
|
|
134 | :joins => cf.join_for_order_statement, | |
|
|
135 | :format => cf.field_format, | |
|
|
136 | :label => cf.name} | |
|
|
137 | end if @project | |
|
|
138 | ||
|
|
139 | 132 | # Add list and boolean time entry custom fields |
|
|
140 | TimeEntryCustomField.all.select {|cf| %w(list bool).include? cf.field_format }.each do |cf| | |
|
|
141 | @available_criteria["cf_#{cf.id}"] = {:sql => "#{cf.join_alias}.value", | |
|
|
142 | :joins => cf.join_for_order_statement, | |
|
|
143 | :format => cf.field_format, | |
|
|
144 | :label => cf.name} | |
|
|
145 | end | |
|
|
146 | ||
|
|
133 | custom_fields += TimeEntryCustomField.all | |
|
|
147 | 134 | # Add list and boolean time entry activity custom fields |
|
|
148 | TimeEntryActivityCustomField.all.select {|cf| %w(list bool).include? cf.field_format }.each do |cf| | |
|
|
135 | custom_fields += TimeEntryActivityCustomField.all | |
|
|
136 | ||
|
|
137 | custom_fields.select {|cf| %w(list bool).include? cf.field_format }.each do |cf| | |
|
|
149 | 138 | @available_criteria["cf_#{cf.id}"] = {:sql => "#{cf.join_alias}.value", |
|
|
150 | 139 | :joins => cf.join_for_order_statement, |
|
|
151 | 140 | :format => cf.field_format, |
General Comments 0
You need to be logged in to leave comments.
Login now