mirror of
https://github.com/redmine/redmine.git
synced 2025-11-05 04:45:57 +01:00
Optimize Gantt chart rendering by reducing version-related queries (#42663).
Patch by Go MAEDA (user:maeda). git-svn-id: https://svn.redmine.org/redmine/trunk@23750 e93f8b46-1217-0410-a6f0-8f06a7374b81
This commit is contained in:
@@ -198,12 +198,18 @@ module Redmine
|
||||
|
||||
# Returns the distinct versions of the issues that belong to +project+
|
||||
def project_versions(project)
|
||||
project_issues(project).filter_map(&:fixed_version).uniq
|
||||
@project_versions ||= {}
|
||||
@project_versions[project&.id] ||= begin
|
||||
ids = project_issues(project).filter_map(&:fixed_version_id).uniq
|
||||
Version.where(id: ids).to_a
|
||||
end
|
||||
end
|
||||
|
||||
# Returns the issues that belong to +project+ and are assigned to +version+
|
||||
def version_issues(project, version)
|
||||
project_issues(project).select {|issue| issue.fixed_version == version}
|
||||
@version_issues ||= {}
|
||||
@version_issues[[project&.id, version&.id]] ||=
|
||||
project_issues(project).select {|issue| issue.fixed_version_id == version&.id}
|
||||
end
|
||||
|
||||
def render(options={})
|
||||
@@ -232,7 +238,7 @@ module Redmine
|
||||
render_object_row(project, options)
|
||||
increment_indent(options) do
|
||||
# render issue that are not assigned to a version
|
||||
issues = project_issues(project).select {|i| i.fixed_version.nil?}
|
||||
issues = project_issues(project).select {|i| i.fixed_version_id.nil?}
|
||||
render_issues(issues, options)
|
||||
# then render project versions and their issues
|
||||
versions = project_versions(project)
|
||||
@@ -778,10 +784,14 @@ module Redmine
|
||||
tag_options[:id] = "issue-#{object.id}"
|
||||
tag_options[:class] = "issue-subject hascontextmenu"
|
||||
tag_options[:title] = object.subject
|
||||
children = object.leaf? ? [] : object.children & project_issues(object.project)
|
||||
has_children =
|
||||
children.present? &&
|
||||
children.collect(&:fixed_version).uniq.intersect?([object.fixed_version])
|
||||
if object.leaf?
|
||||
false
|
||||
else
|
||||
children = object.children & project_issues(object.project)
|
||||
fixed_version_id = object.fixed_version_id
|
||||
children.any? {|child| child.fixed_version_id == fixed_version_id}
|
||||
end
|
||||
when Version
|
||||
tag_options[:id] = "version-#{object.id}"
|
||||
tag_options[:class] = "version-name"
|
||||
|
||||
Reference in New Issue
Block a user