diff options
| author | Eric Davis <edavis@littlestreamsoftware.com> | 2010-05-27 17:16:10 +0000 |
|---|---|---|
| committer | Eric Davis <edavis@littlestreamsoftware.com> | 2010-05-27 17:16:10 +0000 |
| commit | f3cc84b3437a1f5c26748f75bb5cc8b8bca2d719 (patch) | |
| tree | ab6da5fd236250a913967ff8f443fd3bb48d25f2 /app/controllers/projects_controller.rb | |
| parent | e5ac73b7dc80af4c70289cfad13e5e632bb92670 (diff) | |
| download | redmine-f3cc84b3437a1f5c26748f75bb5cc8b8bca2d719.tar.gz redmine-f3cc84b3437a1f5c26748f75bb5cc8b8bca2d719.zip | |
Show subproject versions on the Roadmap.
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@3760 e93f8b46-1217-0410-a6f0-8f06a7374b81
Diffstat (limited to 'app/controllers/projects_controller.rb')
| -rw-r--r-- | app/controllers/projects_controller.rb | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/app/controllers/projects_controller.rb b/app/controllers/projects_controller.rb index cdbb7f64f..e7c123ab7 100644 --- a/app/controllers/projects_controller.rb +++ b/app/controllers/projects_controller.rb @@ -295,7 +295,9 @@ class ProjectsController < 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.sort + @versions = @project.shared_versions || [] + @versions += @project.rolled_up_versions.visible if @with_subprojects + @versions = @versions.uniq.sort @versions.reject! {|version| version.closed? || version.completed? } unless params[:completed] @issues_by_version = {} |