Move `includes` method to OrBaseFilter.

pull/6879/head
Wieland Lindenthal 6 years ago
parent 05bd97d877
commit fdb5fa7eac
  1. 4
      app/models/queries/work_packages/filter/or_base_filter.rb
  2. 4
      app/models/queries/work_packages/filter/search_filter.rb

@ -87,6 +87,10 @@ class Queries::WorkPackages::Filter::OrBaseFilter < Queries::WorkPackages::Filte
filter.values = values
end
end
def includes
filters.map(&:includes).flatten.uniq.reject(&:blank?)
end
def ar_object_filter?
false

@ -59,10 +59,6 @@ class Queries::WorkPackages::Filter::SearchFilter < Queries::WorkPackages::Filte
I18n.t('label_search')
end
def includes
filters.map(&:includes).flatten.uniq.reject(&:blank?)
end
def filter_configurations
list = CE_FILTERS
list + EE_TSV_FILTERS if EnterpriseToken.allows_to?(:attachment_filters) && OpenProject::Database.allows_tsv?

Loading…
Cancel
Save