| @@ -55,14 +55,14 class TimelogController < ApplicationController | |||||
| 55 |
|
55 | |||
| 56 | # Add list and boolean custom fields as available criterias |
|
56 | # Add list and boolean custom fields as available criterias | |
| 57 | @project.all_issue_custom_fields.select {|cf| %w(list bool).include? cf.field_format }.each do |cf| |
|
57 | @project.all_issue_custom_fields.select {|cf| %w(list bool).include? cf.field_format }.each do |cf| | |
| 58 |
@available_criterias["cf_#{cf.id}"] = {:sql => "(SELECT c.value FROM |
|
58 | @available_criterias["cf_#{cf.id}"] = {:sql => "(SELECT c.value FROM #{CustomValue.table_name} c WHERE c.custom_field_id = #{cf.id} AND c.customized_type = 'Issue' AND c.customized_id = #{Issue.table_name}.id)", | |
| 59 | :format => cf.field_format, |
|
59 | :format => cf.field_format, | |
| 60 | :label => cf.name} |
|
60 | :label => cf.name} | |
| 61 | end |
|
61 | end | |
| 62 |
|
62 | |||
| 63 | # Add list and boolean time entry custom fields |
|
63 | # Add list and boolean time entry custom fields | |
| 64 | TimeEntryCustomField.find(:all).select {|cf| %w(list bool).include? cf.field_format }.each do |cf| |
|
64 | TimeEntryCustomField.find(:all).select {|cf| %w(list bool).include? cf.field_format }.each do |cf| | |
| 65 |
@available_criterias["cf_#{cf.id}"] = {:sql => "(SELECT c.value FROM |
|
65 | @available_criterias["cf_#{cf.id}"] = {:sql => "(SELECT c.value FROM #{CustomValue.table_name} c WHERE c.custom_field_id = #{cf.id} AND c.customized_type = 'TimeEntry' AND c.customized_id = #{TimeEntry.table_name}.id)", | |
| 66 | :format => cf.field_format, |
|
66 | :format => cf.field_format, | |
| 67 | :label => cf.name} |
|
67 | :label => cf.name} | |
| 68 | end |
|
68 | end | |
General Comments 0
You need to be logged in to leave comments.
Login now