meineerde/redmine
1
0
Fork 0
mirror of https://github.com/meineerde/redmine.git synced 2026-03-11 11:43:08 +00:00
Code Issues Releases Wiki Activity

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

Browse Source 
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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
project_inheritance/app/controllers/projects_controller.rb
View File

@ -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

4
project_inheritance/app/views/projects/roadmap.rhtml
View File

@ -11,8 +11,8 @@
<%= render(:partial => "wiki/content", :locals => {:content => version.wiki_page.content}) if version.wiki_page %>
<% issues = version.fixed_issues.find(:all,
:include => [:status, :tracker],
:conditions => ["tracker_id in (#{@selected_tracker_ids.join(',')})"],
:include => [:status, :tracker, :project],
:conditions => ["#{Issue.table_name}.tracker_id IN (?) AND (#{Project.table_name}.id = ? OR #{Project.table_name}.parent_id = ?)", @selected_tracker_ids, @project.id, @project.id],
:order => "#{Tracker.table_name}.position") unless @selected_tracker_ids.empty?
issues ||= []
%>