Merge branch 'release/7.1' into dev

pull/6827/head
Jens Ulferts 7 years ago
commit fd356f3566
No known key found for this signature in database
GPG Key ID: 3CAA4B1182CF5308
  1. 2
      lib/report/group_by/base.rb

@ -24,7 +24,7 @@ class Report::GroupBy
inherited_attributes :group_fields, list: true, merge: false inherited_attributes :group_fields, list: true, merge: false
def correct_position? def correct_position?
type == :row or !child.is_a?(engine::GroupBy::Base) or child.type == :column type == :row or !child.is_a?(Report::GroupBy::Base) or child.type == :column
end end
def filter? def filter?

Loading…
Cancel
Save