summaryrefslogtreecommitdiffstats
path: root/app/helpers/queries_helper.rb
diff options
context:
space:
mode:
authorJean-Philippe Lang <jp_lang@yahoo.fr>2016-07-12 19:28:49 +0000
committerJean-Philippe Lang <jp_lang@yahoo.fr>2016-07-12 19:28:49 +0000
commit03dbf8abb881e333256b1cf046b04532b3164d21 (patch)
treea85915265ada3067d3d94e40e14cf1540f87a1af /app/helpers/queries_helper.rb
parentf01b0887ff3ac48bfc7a45b05a8ec17891ddfe19 (diff)
downloadredmine-03dbf8abb881e333256b1cf046b04532b3164d21.tar.gz
redmine-03dbf8abb881e333256b1cf046b04532b3164d21.zip
Remove special behaviour for listing issue time entries, use a filter for that.
git-svn-id: http://svn.redmine.org/redmine/trunk@15644 e93f8b46-1217-0410-a6f0-8f06a7374b81
Diffstat (limited to 'app/helpers/queries_helper.rb')
-rw-r--r--app/helpers/queries_helper.rb4
1 files changed, 3 insertions, 1 deletions
diff --git a/app/helpers/queries_helper.rb b/app/helpers/queries_helper.rb
index d457593d5..e2e09c7de 100644
--- a/app/helpers/queries_helper.rb
+++ b/app/helpers/queries_helper.rb
@@ -24,8 +24,10 @@ module QueriesHelper
ungrouped = []
grouped = {}
query.available_filters.map do |field, field_options|
- if [:tree, :relation].include?(field_options[:type])
+ if field_options[:type] == :relation
group = :label_relations
+ elsif field_options[:type] == :tree
+ group = query.is_a?(IssueQuery) ? :label_relations : nil
elsif field =~ /^(.+)\./
# association filters
group = "field_#{$1}"