jro_apps/redmine Commit - r15791:309c6cec861b

Don't preload custom field filter values (#24787)....

Jean-Philippe Lang -

r15791:309c6cec861b

parent child

Context file:

r15791:309c6cec861b

app/models/query.rb 0 -5

               # Adds a filter for the given custom field
               def add_custom_field_filter(field, assoc=nil)
                 options = field.query_filter_options(self)
-                if field.format.target_class && field.format.target_class <= User
-                  if options[:values].is_a?(Array) && User.current.logged?
-                    options[:values].unshift ["<< #{l(:label_me)} >>", "me"]
-                  end
-                end
                 filter_id = "cf_#{field.id}"
                 filter_name = field.name

lib/redmine/field_format.rb +5 -1

                   end
                   def query_filter_options(custom_field, query)
-                    {:type => :list_optional, :values => query_filter_values(custom_field, query)}
+                    {:type => :list_optional, :values => lambda { query_filter_values(custom_field, query) }}
                   end
                   protected
                       custom_field.user_role.map!(&:to_s).reject!(&:blank?)
                     end
                   end
+                  def query_filter_values(*args)
+                    [["<< #{l(:label_me)} >>", "me"]] + super
+                  end
                 end
                 class VersionFormat < RecordList

test/unit/lib/redmine/field_format/version_field_format_test.rb +1 -1

                 query = Query.new(:project => project)
                 assert_not_include version.name, field.possible_values_options(project).map(&:first)
-                assert_include version.name, field.query_filter_options(query)[:values].map(&:first)
+                assert_include version.name, field.query_filter_options(query)[:values].call.map(&:first)
               end
             end

General Comments 0

You need to be logged in to leave comments. Login now

No TODOs yet

	Repositories
g s	Goto summary page
g c	Goto changelog page
g f	Goto files page
g F	Goto files page with file search activated
g p	Goto pull requests page
g o	Goto repository settings
g O	Goto repository access permissions settings
t s	Toggle sidebar on some pages