Subprojects roadmap shows parent project versions (unless versions inheritance was disabled in settings).

Parent project roadmap shows versions of all subprojects.

git-svn-id: http://redmine.rubyforge.org/svn/branches/work@1056 e93f8b46-1217-0410-a6f0-8f06a7374b81
This commit is contained in:
Jean-Philippe Lang
2008-01-12 12:30:30 +00:00
parent 2c9b04fdfd
commit 6a36929a1d
2 changed files with 7 additions and 3 deletions
@@ -330,8 +330,12 @@ class ProjectsController < ApplicationController
def roadmap
@trackers = @project.trackers.find(:all, :conditions => ["is_in_roadmap=?", true])
retrieve_selected_tracker_ids(@trackers)
@versions = @project.versions.sort
# Subprojects roadmap shows parent project versions (unless versions inheritance was disabled in settings)
@versions = @project.assignable_versions
# Parent project roadmap shows versions of all subprojects
@versions += Version.find(:all, :conditions => {:project_id => @project.child_ids}) unless @project.child_ids.empty?
@versions = @versions.select {|v| !v.completed? } unless params[:completed]
@versions.sort!
end
def activity