jro_apps/redmine Commit - r11993:3172359f9704

Avoid N queries when displaying the issue list with custom fields....

Jean-Philippe Lang -

r11993:3172359f9704

parent child

Context file:

r11993:3172359f9704

app/models/issue_query.rb +8 -3

               def issues(options={})
                 order_option = [group_by_sort_order, options[:order]].flatten.reject(&:blank?)
-                issues = Issue.visible.
+                scope = Issue.visible.
                   joins(:status, :project).
                   where(statement).
                   includes(([:status, :project] + (options[:include] || [])).uniq).
                   order(order_option).
                   joins(joins_for_order_statement(order_option.join(','))).
                   limit(options[:limit]).
-                  offset(options[:offset]).
+                  offset(options[:offset])
-                  all
+                if has_custom_field_column?
+                  scope = scope.preload(:custom_values)
+                end
+                issues = scope.all
                 if has_column?(:spent_hours)
                   Issue.load_visible_spent_hours(issues)

app/models/query.rb +4 0

                 column_names && column_names.include?(column.is_a?(QueryColumn) ? column.name : column)
               end
+              def has_custom_field_column?
+                columns.any? {|column| column.is_a? QueryCustomFieldColumn}
+              end
               def has_default_columns?
                 column_names.nil? || column_names.empty?
               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