diff options
| author | Jean-Philippe Lang <jp_lang@yahoo.fr> | 2016-06-18 07:12:30 +0000 |
|---|---|---|
| committer | Jean-Philippe Lang <jp_lang@yahoo.fr> | 2016-06-18 07:12:30 +0000 |
| commit | 038789fbccf7b5bfc4b2d405a800de9e5409a322 (patch) | |
| tree | 3ee283e61bee78e850e165426eb060c6cd0af8e6 /app/controllers/versions_controller.rb | |
| parent | ffdcb22ccb785a1efad942c250267c181d84c7df (diff) | |
| download | redmine-038789fbccf7b5bfc4b2d405a800de9e5409a322.tar.gz redmine-038789fbccf7b5bfc4b2d405a800de9e5409a322.zip | |
Preload custom values when displaying the roadmap.
git-svn-id: http://svn.redmine.org/redmine/trunk@15548 e93f8b46-1217-0410-a6f0-8f06a7374b81
Diffstat (limited to 'app/controllers/versions_controller.rb')
| -rw-r--r-- | app/controllers/versions_controller.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/app/controllers/versions_controller.rb b/app/controllers/versions_controller.rb index e52f4425b..beb0f16a3 100644 --- a/app/controllers/versions_controller.rb +++ b/app/controllers/versions_controller.rb @@ -36,8 +36,8 @@ class VersionsController < ApplicationController @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] - @versions = @project.shared_versions || [] - @versions += @project.rolled_up_versions.visible if @with_subprojects + @versions = @project.shared_versions.preload(:custom_values) + @versions += @project.rolled_up_versions.visible.preload(:custom_values) if @with_subprojects @versions = @versions.uniq.sort unless params[:completed] @completed_versions = @versions.select(&:completed?) |