summaryrefslogtreecommitdiffstats
path: root/lib
diff options
context:
space:
mode:
authorJean-Philippe Lang <jp_lang@yahoo.fr>2014-04-06 11:29:44 +0000
committerJean-Philippe Lang <jp_lang@yahoo.fr>2014-04-06 11:29:44 +0000
commit01ac064935df791ffb6a6726a0f4a5d9722c96b4 (patch)
treed09c2e180eff7f53c64ef34ee793c01bf1b7a6f2 /lib
parent22b2a1f699279b1b2b11880c77854c25114fc27c (diff)
downloadredmine-01ac064935df791ffb6a6726a0f4a5d9722c96b4.tar.gz
redmine-01ac064935df791ffb6a6726a0f4a5d9722c96b4.zip
Exclude custom fields with multiple values from time report criteria (#16519).
git-svn-id: http://svn.redmine.org/redmine/trunk@13055 e93f8b46-1217-0410-a6f0-8f06a7374b81
Diffstat (limited to 'lib')
-rw-r--r--lib/redmine/helpers/time_report.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/redmine/helpers/time_report.rb b/lib/redmine/helpers/time_report.rb
index 14a09694e..bda6454eb 100644
--- a/lib/redmine/helpers/time_report.rb
+++ b/lib/redmine/helpers/time_report.rb
@@ -137,7 +137,7 @@ module Redmine
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|
+ custom_fields.select {|cf| %w(list bool).include?(cf.field_format) && !cf.multiple?}.each do |cf|
@available_criteria["cf_#{cf.id}"] = {:sql => cf.group_statement,
:joins => cf.join_for_order_statement,
:format => cf.field_format,