From f2cc0a11298a149660de6541f881f31d7a467ffd Mon Sep 17 00:00:00 2001 From: Marius BALTEANU Date: Fri, 27 Sep 2019 00:32:33 +0300 Subject: [PATCH 4/6] Filter after project custom fields --- app/models/project_query.rb | 1 + app/models/query.rb | 5 +++++ 2 files changed, 6 insertions(+) diff --git a/app/models/project_query.rb b/app/models/project_query.rb index 71878c2a8..2bc6b40e1 100644 --- a/app/models/project_query.rb +++ b/app/models/project_query.rb @@ -44,6 +44,7 @@ class ProjectQuery < Query :type => :list, :values => [[l(:general_text_yes), "1"], [l(:general_text_no), "0"]] add_available_filter "created_on", :type => :date_past + add_custom_fields_filters(project_custom_fields) end def available_columns diff --git a/app/models/query.rb b/app/models/query.rb index bd2f2ef66..2b06f8d13 100644 --- a/app/models/query.rb +++ b/app/models/query.rb @@ -608,6 +608,11 @@ class Query < ActiveRecord::Base end end + # Returns a scope of project custom fields that are available as columns or filters + def project_custom_fields + ProjectCustomField.all + end + # Returns a scope of project statuses that are available as columns or filters def project_statuses_values [ -- 2.22.0