1
0
mirror of https://github.com/meineerde/redmine.git synced 2025-12-19 15:01:14 +00:00

Preload custom values when displaying the roadmap.

git-svn-id: http://svn.redmine.org/redmine/trunk@15548 e93f8b46-1217-0410-a6f0-8f06a7374b81
This commit is contained in:
Jean-Philippe Lang 2016-06-18 07:12:30 +00:00
parent ffdcb22ccb
commit 038789fbcc

View File

@ -36,8 +36,8 @@ class VersionsController < ApplicationController
@with_subprojects = params[:with_subprojects].nil? ? Setting.display_subprojects_issues? : (params[:with_subprojects] == '1') @with_subprojects = params[:with_subprojects].nil? ? Setting.display_subprojects_issues? : (params[:with_subprojects] == '1')
project_ids = @with_subprojects ? @project.self_and_descendants.collect(&:id) : [@project.id] project_ids = @with_subprojects ? @project.self_and_descendants.collect(&:id) : [@project.id]
@versions = @project.shared_versions || [] @versions = @project.shared_versions.preload(:custom_values)
@versions += @project.rolled_up_versions.visible if @with_subprojects @versions += @project.rolled_up_versions.visible.preload(:custom_values) if @with_subprojects
@versions = @versions.uniq.sort @versions = @versions.uniq.sort
unless params[:completed] unless params[:completed]
@completed_versions = @versions.select(&:completed?) @completed_versions = @versions.select(&:completed?)