From 1fec53cc25ec30d6a397384dfae56557c62db774 Mon Sep 17 00:00:00 2001 From: Jean-Philippe Lang Date: Wed, 10 Feb 2010 21:29:31 +0000 Subject: [PATCH] Fixed: roadmap show subprojects issues even if subprojects is unchecked (#4761). git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@3408 e93f8b46-1217-0410-a6f0-8f06a7374b81 --- app/controllers/projects_controller.rb | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/app/controllers/projects_controller.rb b/app/controllers/projects_controller.rb index 945e4b72..ef137bd8 100644 --- a/app/controllers/projects_controller.rb +++ b/app/controllers/projects_controller.rb @@ -356,13 +356,9 @@ class ProjectsController < ApplicationController @issues_by_version = {} unless @selected_tracker_ids.empty? @versions.each do |version| - conditions = {:tracker_id => @selected_tracker_ids} - if !@project.versions.include?(version) - conditions.merge!(:project_id => project_ids) - end issues = version.fixed_issues.visible.find(:all, :include => [:project, :status, :tracker, :priority], - :conditions => conditions, + :conditions => {:tracker_id => @selected_tracker_ids, :project_id => project_ids}, :order => "#{Project.table_name}.lft, #{Tracker.table_name}.position, #{Issue.table_name}.id") @issues_by_version[version] = issues end