Nemcio/Redmine
1
0
Fork 0
mirror of https://github.com/redmine/redmine.git synced 2026-03-21 11:52:07 +01:00
Code Issues Packages Projects Releases Activity

Merged r11459 from trunk.

Browse Source 
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/2.3-stable@11460 e93f8b46-1217-0410-a6f0-8f06a7374b81
This commit is contained in:
Jean-Philippe Lang
2013-02-24 09:22:41 +00:00
parent 346085c5fc
commit e6d63a4e0d
2 changed files with 32 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
lib/redmine/helpers/time_report.rb
View File

@@ -127,13 +127,16 @@ module Redmine
:label => :label_issue}
}
# Add list and boolean custom fields as available criteria
custom_fields = (@project.nil? ? IssueCustomField.for_all : @project.all_issue_custom_fields)
# Add list and boolean time entry custom fields
custom_fields += TimeEntryCustomField.all
# Add list and boolean time entry activity custom fields
# Add time entry custom fields
custom_fields = TimeEntryCustomField.all
# Add project custom fields
custom_fields += ProjectCustomField.all
# Add issue custom fields
custom_fields += (@project.nil? ? IssueCustomField.for_all : @project.all_issue_custom_fields)
# Add time entry activity custom fields
custom_fields += TimeEntryActivityCustomField.all
# Add list and boolean custom fields as available criteria
custom_fields.select {|cf| %w(list bool).include? cf.field_format }.each do |cf|
@available_criteria["cf_#{cf.id}"] = {:sql => "#{cf.join_alias}.value",
:joins => cf.join_for_order_statement,