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
2008-01-12 12:30:30 +00:00
parent 2c9b04fdfd
commit 6a36929a1d
2 changed files with 7 additions and 3 deletions
@@ -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 ||= []
    %>